diff --git a/.babelrc b/.babelrc
new file mode 100644
index 000000000..86dddd7c0
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,8 @@
+{ 
+    "presets": ["module:metro-react-native-babel-preset", "module:react-native-dotenv"],
+    "plugins": [
+          ["@babel/plugin-transform-flow-strip-types"],
+          ["@babel/plugin-proposal-decorators", { "legacy": true}],
+          ["@babel/plugin-proposal-class-properties", { "loose": true}]
+      ]
+  }
\ No newline at end of file
diff --git a/.expo-shared/assets.json b/.expo-shared/assets.json
new file mode 100644
index 000000000..b3103e525
--- /dev/null
+++ b/.expo-shared/assets.json
@@ -0,0 +1,57 @@
+{
+  "b18ad91ca980baf956293489642506bc7ec58893012aff7ccdb7b41beccf1fda": true,
+  "e6194e8c7f210ddc1457ea089ab56a9a5d6a20d6f285a1b6c74afdbf2082135f": true,
+  "29b577bd087b53e2bbda66b545030f629425b9ec52684d4feba82d2f4c8ae20f": true,
+  "f17cbf9cc6817aecf906b53772e4b177c856f1dd609b3135990017c705d46fc3": true,
+  "e83423047300310d3259bba236fed521dd8f8c22b392bda606b9dd17115fcdf3": true,
+  "b013673750d281b7cc565caf7db1017426fe09a6e8f4807264fece5ff06f193e": true,
+  "21a813ec706b0e30239c865f7aa38872cf020c5d5c3399cbb025631b6eba3d28": true,
+  "36e58a315e5386e3792efe62ed85e69827a1c2c4c711236eec8ced0385b43a7d": true,
+  "a01d0473b9b6e510ce1c65f358f8e5ce139d084be4957c2dba965106c0228231": true,
+  "ee14acbdb1a58adb08642ac54ac9ba3361714d9f5f362b86b3b5a90778fbad4b": true,
+  "9b1c2a73731dfb113bf47523ee7e482f6072ef6e5ccafe4322e810cf9c90fc4c": true,
+  "1af4ee12082d00e6d1edaf3e0360c9da78abf3f5c926d70c6b461f38260def94": true,
+  "0f6a70421b7a71f153a69ba70e34137ad5889e0ef44bf48772540d382eea201a": true,
+  "b3c5927587d5a0860978950098fa6a52d5c84cae8e39bc3b44a41dc62eb47a01": true,
+  "e963c3dd47696aedbf692bd87ab4198f4e68e3258d62044f3e9dafedb4bc8e8b": true,
+  "230f71a214b25015f408f52006919b641fafed72696b28cf6e74f4b248d46d49": true,
+  "22f57ba850080f7bad750a149f472ce8f341fdf57c10765fd8e85dede87eb5be": true,
+  "1feac0c84120d449bbec45e2d7736d5bf6bb9deb06cbd29e3b47ce98f788d61a": true,
+  "7cf7ca761792786f0aefc45f141e0bed32bba529930a3188e9f4d9bd260a7e07": true,
+  "ccaa8add20c8ffb77cfe6e0ec50d1928b989e778ae2b6214ebbba11ab8cf6a77": true,
+  "9437f40bcbca3df57297f38cdd3a8fe767b7ddeee036b2553785b6a348f6d0c8": true,
+  "ef5fac67c6b20a2217a55a20ddcb88059b0dd37d3fff9cfda4c29fae96003e2f": true,
+  "a265d571f3e2c1516fc192cb4cae9b1a77a9b154f4f4223f54737183d7f95122": true,
+  "8d811db7ed6a4444e295734d03d73854e5a6551c733173a72cfd61d23a6c026c": true,
+  "0652d8c040aadd3c3b7f09ca8db5e8f9e9d3e2fa6b9fe253c16cfb170a7b31fd": true,
+  "ab5c30fea21e1e49aa73e0afcdd9ec086e4be470b1babd5364ce2a4c20cf8c79": true,
+  "6053c7fd7ba930d8f24eeaccd286e985c1ad641cdf8c24411af1aa797478e99e": true,
+  "5954866eea13ae0537d2b80c0cf93f9f0d748b8e57c8f4523ac17ea733708792": true,
+  "2c5f59243e6dc6b9714c7929c7e2f2b34736ba1c6d480b2a393d2a723da00dad": true,
+  "a5edd3f7e19425af6f761b5fc6be9e3aea6c8250cb19b66198f237ebe34fd108": true,
+  "1ebe9f1ccab3eab3e423ac26d6cac9b8b1e21a65bcde69adb01398a1a936943f": true,
+  "1499fa218866a0afb200db1a55b2bf41a94a8c499ae8320c36bd11b08f98dc53": true,
+  "035c1c0198123cdc2cd7ef2a9dbc26c5d7e71bd0d30e380120f0f4f4834d488b": true,
+  "dc5607e591d6321e5cc1979951b894d2f69dad6870713c0bb96730a157df367f": true,
+  "70faf1c80e010ab13feff72ac727b144c2e1c02276d18dc69ac0883110666a9f": true,
+  "51b75587fe9246ec6dc441afa2fb85ec95ce1004cee96912db9b86e5dbefe57e": true,
+  "3de9e00b426d59f57f89f59899797b441ed4dc1e6783a80d07530faf865a52f4": true,
+  "14ad0457f95c5bb980bae3d46faa8e80de996cdcc3e434ac103504f13a68bd25": true,
+  "d94811d7fb2fdae32f52d771bd6c98ad2c54bd3398fcd3fbcce0d68b732b1981": true,
+  "8b14765a18ce2cdb6695628ebef0decd68bd8f9900e11afb6dd36ec3182336e7": true,
+  "2bb9b9b85443989e8d5af16bb29c745e4bb724f47f60cc0cd562a7e64a0bfb92": true,
+  "3f3d87546aee1a2502a1e634dc743e02c5f3ecf932bf599e06c40e6d319ed324": true,
+  "824ff3637cd21227e9e740ab550aed85c16382d3f231acec54eef9c5444d16c1": true,
+  "a9eefbb09ba831d3d73bf36115676e665813fded4af77afb705658e163256fb4": true,
+  "ac58cba8a2b570b4921694fbe6f1f1c1ab0a56d4f39d8ea8c9c17c5a59b613b5": true,
+  "80d49f5a533c37016859af62026d65f1da5216a4cf963e023b293866f5b70629": true,
+  "f4ae418fea416ea54362df0d7e8b5e9558332833990f96cd1ae9d52ab3f7ede8": true,
+  "0e0edb829c14f0e8f1be4d1719bcf89b9685743e006c442ebbbd9af4837b2213": true,
+  "a48c11020daa28205d6a9a11b8a4bd5895338c955583d1b69d47cea8b647c255": true,
+  "de0f21c5d5a364076c77ad27531d4735c92976e3ce6f9d51a17097f6805fce1b": true,
+  "e58edd633ca8122fca976453338a5c88fbb97b250d66c0a6e10d794ea873cd40": true,
+  "73baeffafbc75ca598e4f6fe8e1a3a5bc5a45911875af622fffd0e59cce48ac3": true,
+  "9da5dd1c6c712b4359c742aa9e2afd1003f4036fe7d860febaaa9d15291dd0d9": true,
+  "9353b2db65c5419a3435f4881b110c764614f97ae22645ba60650e35a48cd8fd": true,
+  "78bff6771e68dedf079a292f28da83121a4f3f8d5db9f80e1bdf2db36705f7e7": true
+}
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..dd84ea782
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..bbcbbe7d6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/user-story.md b/.github/ISSUE_TEMPLATE/user-story.md
new file mode 100644
index 000000000..b33244c23
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/user-story.md
@@ -0,0 +1,43 @@
+---
+name: User Story
+about: A valuable increment of functionality, testable by the users
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+As a ‹role›, I'd like to ‹feature short description› [ , in order to ‹value it adds›. ]
+
+## Conditions of satisfaction
+
+- [ ] Should ‹testable condition that should be satisfied›
+- [ ] Should ‹testable condition that should be satisfied›
+- [ ] …
+
+## Tasks
+- [ ] task 1
+- [ ] task 2
+- [ ] …
+
+## Notes and resources
+
+* e.g. some useful information or context for the story
+* e.g. links to designs or slack conversations
+* ...
+
+## Story writing guidelines - Can delete everything below here
+
+*Acceptance criteria* are things that can be verified to show that this user story is satisfied.
+
+* [“Advantages of the “As a user, I want” user story template.”](http://www.mountaingoatsoftware.com/blog/advantages-of-the-as-a-user-i-want-user-story-template)
+
+
+### A good user story should be (I-N-V-E-S-T principle)
+
+* _Independent_ (from other user stories, allowing to realize them in any order);
+* _Negotiable_ (omit details that would freeze the story);
+* _Valuable_ (implementation delivers an increment of functionality, observable by and useful to users);
+* _Estimatable_ (developers should be able to estimate its size relative to other stories);
+* _Sizable_ (implementation fits in one iteration – if it needs many to complete, it is an EPIC);
+* _Testable_ (user must be able to check the conditions of satisfaction).
diff --git a/.github/logos/FHV_logo.png b/.github/logos/FHV_logo.png
new file mode 100644
index 000000000..97c38963e
Binary files /dev/null and b/.github/logos/FHV_logo.png differ
diff --git a/.github/logos/HVA_logo.png b/.github/logos/HVA_logo.png
new file mode 100644
index 000000000..e6303503a
Binary files /dev/null and b/.github/logos/HVA_logo.png differ
diff --git a/.github/logos/IHP_logo.png b/.github/logos/IHP_logo.png
new file mode 100644
index 000000000..9ea0c430d
Binary files /dev/null and b/.github/logos/IHP_logo.png differ
diff --git a/.github/logos/ITC_logo.png b/.github/logos/ITC_logo.png
new file mode 100644
index 000000000..6894c8434
Binary files /dev/null and b/.github/logos/ITC_logo.png differ
diff --git a/.github/logos/combined_logos.png b/.github/logos/combined_logos.png
new file mode 100644
index 000000000..4f24e59ef
Binary files /dev/null and b/.github/logos/combined_logos.png differ
diff --git a/.github/logos/erasmus_logo.png b/.github/logos/erasmus_logo.png
new file mode 100644
index 000000000..92c90963f
Binary files /dev/null and b/.github/logos/erasmus_logo.png differ
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 000000000..7536a789e
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,15 @@
+name: Move new issues into backlog column
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  automate-project-columns:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: alex-page/github-project-automation-plus@v0.1.0 
+        with:
+          project: Celiapp
+          column: Backlog
+          repo-token: ${{ secrets.GITHUB_ACTION_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 275c16e53..4b221649d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,9 +12,11 @@
 
 # production
 /build
+/dist/assets
+/dist/bundles
 
 # misc
-.DS_Store
+.env
 .env.local
 .env.development.local
 .env.test.local
diff --git a/App.js b/App.js
index 85d34c84b..615c50c3d 100644
--- a/App.js
+++ b/App.js
@@ -1,21 +1,29 @@
 import React from 'react';
-import { View, StyleSheet } from 'react-native';
+import { View, StyleSheet, AppState } from 'react-native';
 import AppNavigator from './src/navigation/AppNavigator';
 import LoadingScreen from './src/screens/LoadingScreen';
 import DatabaseManager from './src/manager/DatabaseManager';
 import LanguageManager from './src/manager/LanguageManager';
 import GlutonManager from './src/manager/GlutonManager';
 import GearManager from './src/manager/GearManager';
+import UploadManager from './src/manager/UploadManager';
+import NotificationManager from './src/manager/NotificationManager';
+import UsernameDialog from './src/components/UsernameDialog';
+
+
+import { } from 'react-native-dotenv';
+import FlashMessage from 'react-native-flash-message';
 
 export default class App extends React.Component {
   state = {
     isSplashReady: false,
     isAppReady: false,
+    appState: AppState.currentState
   }
 
   componentDidMount() {
     DatabaseManager.getInstance().loadSettings(null, 
-      (_, error) => { alert(JSON.stringify(error)); }, 
+      (_, error) => { alert("error loading settings" + JSON.stringify(error)); }, 
       (_, {rows: { _array }}) => {
         let settings = {};
 
@@ -26,25 +34,80 @@ export default class App extends React.Component {
         this.initApplication(settings);
       }
     );
+
+    AppState.addEventListener('change', this._handleAppStateChange);
+  }
+
+  componentWillUnmount() {
+    AppState.removeEventListener('change', this._handleAppStateChange);
+    console.log("unmounting App")
   }
 
+  _handleAppStateChange = (nextAppState) => {
+    if (
+      nextAppState.match(/inactive|background/) &&
+      this.state.appState === 'active'
+    ) {
+      this.uploadFreshData();
+      console.log('App is going to background!');
+    }
+    this.setState({appState: nextAppState});
+  };
+
   initApplication(settings) {
     LanguageManager.getInstance().setLanguage(settings.language);
+    NotificationManager.getInstance(); //just to show the user the notification permission screen.
     GlutonManager.getInstance().setBuddy(settings.nickname);
+    
     GearManager.getInstance().setWsHost(settings.wsHost);
     GearManager.getInstance().setGearHost(settings.gearHost);
-    
     GearManager.getInstance().connect();
-
-    this.setState({isSplashReady: true});
+    
+    this.uploadFreshData();
+    
+    this.setState({
+      isSplashReady: true,
+      hasUserId: !!settings.userId,
+      userId: settings.userId
+    });
     setTimeout(() =>  this.setState({isAppReady: true}), 3000);
   }
 
+  
+  handleNewUsername = (userName) => {
+    console.log("Saving username:" + JSON.stringify(userName));
+    DatabaseManager.getInstance().saveSettings('userId', userName, (error) => {alert(error)}, null);
+    
+    this.setState({ 
+      hasUserId : true,
+      userId: userName})
+  };
+
+  getUploadServiceAuthToken = () => this.state.userId
+
+  uploadFreshData() {
+    token = this.getUploadServiceAuthToken()
+    //TODO get new auth token
+    if (token) {
+      UploadManager.getInstance().setToken(token);
+      DatabaseManager.getInstance().fetchUnrecordedData((_, error) => console.error(error), (_, data) => {
+        UploadManager.getInstance().uploadData(data, () => { DatabaseManager.getInstance().updateLastRecorded(); });
+      });
+    }
+  }
+
   render() {
     return (
       <View style={styles.container}>
-        {this.state.isSplashReady == false ? null : <AppNavigator/>}
+
+        {this.state.isSplashReady == false 
+          ? null 
+          : this.state.hasUserId 
+            ? <AppNavigator/>
+            : <UsernameDialog onUsername ={this.handleNewUsername}/>
+        }
         <LoadingScreen hide={this.state.isAppReady} style={styles.loading}/>
+        <FlashMessage position="bottom" duration={5000}/>
       </View>
     );
   }
diff --git a/CeliServer/build.xml b/CeliServer/build.xml
deleted file mode 100644
index d46fc366c..000000000
--- a/CeliServer/build.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="CeliServer" default="default" basedir=".">
-    <description>Builds, tests, and runs the project CeliServer.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar:                  JAR building
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="CeliServer-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-</project>
diff --git a/CeliServer/dist/CeliServer.jar b/CeliServer/dist/CeliServer.jar
deleted file mode 100644
index 3457ccf74..000000000
Binary files a/CeliServer/dist/CeliServer.jar and /dev/null differ
diff --git a/CeliServer/dist/README.TXT b/CeliServer/dist/README.TXT
deleted file mode 100644
index cbe837193..000000000
--- a/CeliServer/dist/README.TXT
+++ /dev/null
@@ -1,32 +0,0 @@
-========================
-BUILD OUTPUT DESCRIPTION
-========================
-
-When you build an Java application project that has a main class, the IDE
-automatically copies all of the JAR
-files on the projects classpath to your projects dist/lib folder. The IDE
-also adds each of the JAR files to the Class-Path element in the application
-JAR files manifest file (MANIFEST.MF).
-
-To run the project from the command line, go to the dist folder and
-type the following:
-
-java -jar "CeliServer.jar" 
-
-To distribute this project, zip up the dist folder (including the lib folder)
-and distribute the ZIP file.
-
-Notes:
-
-* If two JAR files on the project classpath have the same name, only the first
-JAR file is copied to the lib folder.
-* Only JAR files are copied to the lib folder.
-If the classpath contains other types of files or folders, these files (folders)
-are not copied.
-* If a library on the projects classpath also has a Class-Path element
-specified in the manifest,the content of the Class-Path element has to be on
-the projects runtime path.
-* To set a main class in a standard Java project, right-click the project node
-in the Projects window and choose Properties. Then click Run and enter the
-class name in the Main Class field. Alternatively, you can manually type the
-class name in the manifest Main-Class element.
diff --git a/CeliServer/dist/SETUP.txt b/CeliServer/dist/SETUP.txt
deleted file mode 100644
index d3f20e07a..000000000
--- a/CeliServer/dist/SETUP.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-1. Router anschliessen (AN-Knopf ist bereits gedrückt)
-
-2. Laptop mit Netzwerk verbinden
-	CONFIG_WIFI_SSID="Thomson16C033"
-	CONFIG_WIFI_PASSWORD="7A3F1AC002"
-
-3. CeliGear anschliessen 
-	-> Sollte sich automisch verbinden (grüne/rote LED an)
-	IP: 10.0.0.2 (ist aber nicht garantiert!)
-	PORT: 20000
-
-4. Smartphone mit Netzwerk verbinden
-	CONFIG_WIFI_SSID="Thomson16C033"
-	CONFIG_WIFI_PASSWORD="7A3F1AC002"
-
-5. Thomson Gateway (Webbrowser)
-	IP: 10.0.0.138
-	Bei "Heimnetzwerk > Geräte" ist IP-Liste
-	-> ganz unten sind die gültigen Geräte gelistet (IP != 0.0.0.0)
-
-6. CeliServer starten
-	-> "run.bat" im dist-Verzeichnis oder
-	-> console: "java -jar <path_to_dist>/CeliServer.jar
-	IP: siehe laptop (oder console: ipconfig)
-	PORT: 8080 (default)
-	--> in der "run.bat" kann auch der PORT geändert werden
-	
-7. CeliApp öffnen, IPs im GEAR-Menü anpassen, ! SPEICHERN !
-
-8. CeliApp neustarten oder im GEAR_Menü (nur) "connect" drücken
-	-> "connect" sollte bei richtiger config auf "disconnect" wechseln
-	-> "link" sollte bei richtiger config auf "unlink" wechseln
-	--> CeliServer console gibt quasi selbe Informationen
-	--> Konfig-Fenster sollte bei Erfolg erscheinen
-
-9. Konfig-Fenster
-	Colormode und Tageszeit auswählen
-	-> wenn nicht "Nacht", sollten LEDs an sein
-	--> wird Fenster geschlossen, so werden Verbindungen getrennt
-	--> wird Verbindung getrennt, wird das Fenster geschlossen
-	--> CeliServer muss nicht neugestartet werden
-
-10. TROUBLESHOOTING:
-	* CeliGear: Wenn es nicht verbindet, mit Smartphone zu "WiFi101" connecten
-	und im Browser (Wifi101) konfigurieren.
-	* CeliServer: Java installiert "java -version" (1.8 empfohlen)? Serverconsole 
-	schliessen und neustarten, ggf. auf belegten PORT überprüfen (netstat -a)
-	* Surface: Verbindungsprobleme?? ggf. "Heimnetzwerk" oder Firewall einstellen
-	-> sonst anderes Teil besorgen; ...oder Server als App hack'n'slay-Lösung umsetzen
-	* CeliApp: Kann vereinzelt zu alerts kommen, wenn ein disconnect auftritt,
-	sollte aber die App nicht weiter stören. ggf. Neustart
\ No newline at end of file
diff --git a/CeliServer/dist/run.bat b/CeliServer/dist/run.bat
deleted file mode 100644
index 925e4bc30..000000000
--- a/CeliServer/dist/run.bat
+++ /dev/null
@@ -1 +0,0 @@
-java -jar CeliServer.jar 8080
\ No newline at end of file
diff --git a/CeliServer/manifest.mf b/CeliServer/manifest.mf
deleted file mode 100644
index 328e8e5bc..000000000
--- a/CeliServer/manifest.mf
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-
diff --git a/CeliServer/nbproject/build-impl.xml b/CeliServer/nbproject/build-impl.xml
deleted file mode 100644
index 253da8cdb..000000000
--- a/CeliServer/nbproject/build-impl.xml
+++ /dev/null
@@ -1,1420 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
-  - initialization
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - test compilation
-  - test execution
-  - test debugging
-  - applet
-  - cleanup
-
-        -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="CeliServer-impl">
-    <fail message="Please build using Ant 1.8.0 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.8.0"/>
-            </not>
-        </condition>
-    </fail>
-    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-    <!-- 
-                ======================
-                INITIALIZATION SECTION 
-                ======================
-            -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init" name="-init-private">
-        <property file="nbproject/private/config.properties"/>
-        <property file="nbproject/private/configs/${config}.properties"/>
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private" name="-init-user">
-        <property file="${user.properties.file}"/>
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.6"/>
-        <property name="default.javac.target" value="1.6"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
-        <property file="nbproject/configs/${config}.properties"/>
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
-        <property name="platform.java" value="${java.home}/bin/java"/>
-        <available file="${manifest.file}" property="manifest.available"/>
-        <condition property="splashscreen.available">
-            <and>
-                <not>
-                    <equals arg1="${application.splash}" arg2="" trim="true"/>
-                </not>
-                <available file="${application.splash}"/>
-            </and>
-        </condition>
-        <condition property="main.class.available">
-            <and>
-                <isset property="main.class"/>
-                <not>
-                    <equals arg1="${main.class}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="profile.available">
-            <and>
-                <isset property="javac.profile"/>
-                <length length="0" string="${javac.profile}" when="greater"/>
-                <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
-            </and>
-        </condition>
-        <condition property="do.archive">
-            <or>
-                <not>
-                    <istrue value="${jar.archive.disabled}"/>
-                </not>
-                <istrue value="${not.archive.disabled}"/>
-            </or>
-        </condition>
-        <condition property="do.mkdist">
-            <and>
-                <isset property="do.archive"/>
-                <isset property="libs.CopyLibs.classpath"/>
-                <not>
-                    <istrue value="${mkdist.disabled}"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="do.archive+manifest.available">
-            <and>
-                <isset property="manifest.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+main.class.available">
-            <and>
-                <isset property="main.class.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+splashscreen.available">
-            <and>
-                <isset property="splashscreen.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+profile.available">
-            <and>
-                <isset property="profile.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="have.tests">
-            <or>
-                <available file="${test.src.dir}"/>
-            </or>
-        </condition>
-        <condition property="have.sources">
-            <or>
-                <available file="${src.dir}"/>
-            </or>
-        </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <and>
-                <isset property="javadoc.preview"/>
-                <isfalse value="${javadoc.preview}"/>
-            </and>
-        </condition>
-        <property name="run.jvmargs" value=""/>
-        <property name="run.jvmargs.ide" value=""/>
-        <property name="javac.compilerargs" value=""/>
-        <property name="work.dir" value="${basedir}"/>
-        <condition property="no.deps">
-            <and>
-                <istrue value="${no.dependencies}"/>
-            </and>
-        </condition>
-        <property name="javac.debug" value="true"/>
-        <property name="javadoc.preview" value="true"/>
-        <property name="application.args" value=""/>
-        <property name="source.encoding" value="${file.encoding}"/>
-        <property name="runtime.encoding" value="${source.encoding}"/>
-        <property name="manifest.encoding" value="${source.encoding}"/>
-        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-            <and>
-                <isset property="javadoc.encoding"/>
-                <not>
-                    <equals arg1="${javadoc.encoding}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <property name="javadoc.encoding.used" value="${source.encoding}"/>
-        <property name="includes" value="**"/>
-        <property name="excludes" value=""/>
-        <property name="do.depend" value="false"/>
-        <condition property="do.depend.true">
-            <istrue value="${do.depend}"/>
-        </condition>
-        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
-        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
-            <and>
-                <isset property="endorsed.classpath"/>
-                <not>
-                    <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
-            <isset property="profile.available"/>
-        </condition>
-        <condition else="false" property="jdkBug6558476">
-            <and>
-                <matches pattern="1\.[56]" string="${java.specification.version}"/>
-                <not>
-                    <os family="unix"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="false" property="javac.fork">
-            <or>
-                <istrue value="${jdkBug6558476}"/>
-                <istrue value="${javac.external.vm}"/>
-            </or>
-        </condition>
-        <property name="jar.index" value="false"/>
-        <property name="jar.index.metainf" value="${jar.index}"/>
-        <property name="copylibs.rebase" value="true"/>
-        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
-        <condition property="junit.available">
-            <or>
-                <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
-                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
-            </or>
-        </condition>
-        <condition property="testng.available">
-            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
-        </condition>
-        <condition property="junit+testng.available">
-            <and>
-                <istrue value="${junit.available}"/>
-                <istrue value="${testng.available}"/>
-            </and>
-        </condition>
-        <condition else="testng" property="testng.mode" value="mixed">
-            <istrue value="${junit+testng.available}"/>
-        </condition>
-        <condition else="" property="testng.debug.mode" value="-mixed">
-            <istrue value="${junit+testng.available}"/>
-        </condition>
-        <property name="java.failonerror" value="true"/>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
-        <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="dist.dir">Must set dist.dir</fail>
-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-        <fail unless="dist.jar">Must set dist.jar</fail>
-    </target>
-    <target name="-init-macrodef-property">
-        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${@{value}}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${javac.processorpath}" name="processorpath"/>
-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath"/>
-            <attribute default="${empty.dir}" name="gensrcdir"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.dir}/empty" name="empty.dir"/>
-                <mkdir dir="${empty.dir}"/>
-                <mkdir dir="@{apgeneratedsrcdir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <compilerarg value="-processorpath"/>
-                    <compilerarg path="@{processorpath}:${empty.dir}"/>
-                    <compilerarg line="${ap.processors.internal}"/>
-                    <compilerarg line="${annotation.processing.processor.options}"/>
-                    <compilerarg value="-s"/>
-                    <compilerarg path="@{apgeneratedsrcdir}"/>
-                    <compilerarg line="${ap.proc.none.internal}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${javac.processorpath}" name="processorpath"/>
-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath"/>
-            <attribute default="${empty.dir}" name="gensrcdir"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.dir}/empty" name="empty.dir"/>
-                <mkdir dir="${empty.dir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
-        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <sequential>
-                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </depend>
-            </sequential>
-        </macrodef>
-        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <sequential>
-                <fail unless="javac.includes">Must set javac.includes</fail>
-                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
-                    <path>
-                        <filelist dir="@{destdir}" files="${javac.includes}"/>
-                    </path>
-                    <globmapper from="*.java" to="*.class"/>
-                </pathconvert>
-                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
-                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
-                <delete>
-                    <files includesfile="${javac.includesfile.binary}"/>
-                </delete>
-                <delete>
-                    <fileset file="${javac.includesfile.binary}"/>
-                </delete>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-init">
-        <condition else="false" property="nb.junit.batch" value="true">
-            <and>
-                <istrue value="${junit.available}"/>
-                <not>
-                    <isset property="test.method"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="false" property="nb.junit.single" value="true">
-            <and>
-                <istrue value="${junit.available}"/>
-                <isset property="test.method"/>
-            </and>
-        </condition>
-    </target>
-    <target name="-init-test-properties">
-        <property name="test.binaryincludes" value="&lt;nothing&gt;"/>
-        <property name="test.binarytestincludes" value=""/>
-        <property name="test.binaryexcludes" value=""/>
-    </target>
-    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                            <filename name="${test.binarytestincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
-    <target if="${testng.available}" name="-init-macrodef-testng">
-        <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
-                    <isset property="test.method"/>
-                </condition>
-                <union id="test.set">
-                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
-                        <filename name="@{testincludes}"/>
-                    </fileset>
-                </union>
-                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="CeliServer" testname="TestNG tests" workingDir="${work.dir}">
-                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
-                    <propertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </propertyset>
-                    <customize/>
-                </testng>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-test-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <echo>No tests executed.</echo>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:testng>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
-        <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <sequential>
-                <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                        <jvmarg line="${run.jvmargs}"/>
-                        <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
-                </j2seproject3:test-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                            <filename name="${test.binarytestincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
-        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit-debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${testng.available}" name="-init-macrodef-testng-debug">
-        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <element name="customize2" optional="true"/>
-            <sequential>
-                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
-                    <isset property="test.method"/>
-                </condition>
-                <condition else="-suitename CeliServer -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
-                    <matches pattern=".*\.xml" string="@{testClass}"/>
-                </condition>
-                <delete dir="${build.test.results.dir}" quiet="true"/>
-                <mkdir dir="${build.test.results.dir}"/>
-                <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
-                    <customize>
-                        <customize2/>
-                        <jvmarg value="-ea"/>
-                        <arg line="${testng.debug.mode}"/>
-                        <arg line="-d ${build.test.results.dir}"/>
-                        <arg line="-listener org.testng.reporters.VerboseReporter"/>
-                        <arg line="${testng.cmd.args}"/>
-                    </customize>
-                </j2seproject3:debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
-        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <element implicit="true" name="customize2" optional="true"/>
-            <sequential>
-                <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
-                    <customize2/>
-                </j2seproject3:testng-debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
-        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <sequential>
-                <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                        <jvmarg line="${run.jvmargs}"/>
-                        <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
-                </j2seproject3:test-debug-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
-        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <sequential>
-                <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
-                    <customize2>
-                        <syspropertyset>
-                            <propertyref prefix="test-sys-prop."/>
-                            <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                        </syspropertyset>
-                    </customize2>
-                </j2seproject3:testng-debug-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
-    <!--
-                pre NB7.2 profiling section; consider it deprecated
-            -->
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
-    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
-        <macrodef name="resolve">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${env.@{value}}"/>
-            </sequential>
-        </macrodef>
-        <macrodef name="profile">
-            <attribute default="${main.class}" name="classname"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property environment="env"/>
-                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
-                <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
-                    <jvmarg line="${profiler.info.jvmargs}"/>
-                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-                    <arg line="${application.args}"/>
-                    <classpath>
-                        <path path="${run.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
-        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
-        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
-    </target>
-    <!--
-                end of pre NB7.2 profiling section
-            -->
-    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="name"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <attribute default="" name="stopclassname"/>
-            <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${build.classes.dir}" name="dir"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset dir="@{dir}" includes="${fix.classes}">
-                        <include name="${fix.includes}*.class"/>
-                    </fileset>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
-        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
-            <os family="windows"/>
-        </condition>
-        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
-            <isset property="debug.transport"/>
-        </condition>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-java">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${run.classpath}" name="classpath"/>
-            <attribute default="jvm" name="jvm"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-copylibs">
-        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${manifest.file}" name="manifest"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-                <pathconvert property="run.classpath.without.build.classes.dir">
-                    <path path="${run.classpath}"/>
-                    <map from="${build.classes.dir.resolved}" to=""/>
-                </pathconvert>
-                <pathconvert pathsep=" " property="jar.classpath">
-                    <path path="${run.classpath.without.build.classes.dir}"/>
-                    <chainedmapper>
-                        <flattenmapper/>
-                        <filtermapper>
-                            <replacestring from=" " to="%20"/>
-                        </filtermapper>
-                        <globmapper from="*" to="lib/*"/>
-                    </chainedmapper>
-                </pathconvert>
-                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
-                    <manifest>
-                        <attribute name="Class-Path" value="${jar.classpath}"/>
-                        <customize/>
-                    </manifest>
-                </copylibs>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-presetdef-jar">
-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
-                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
-            </jar>
-        </presetdef>
-    </target>
-    <target name="-init-ap-cmdline-properties">
-        <property name="annotation.processing.enabled" value="true"/>
-        <property name="annotation.processing.processors.list" value=""/>
-        <property name="annotation.processing.processor.options" value=""/>
-        <property name="annotation.processing.run.all.processors" value="true"/>
-        <property name="javac.processorpath" value="${javac.classpath}"/>
-        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
-        <condition property="ap.supported.internal" value="true">
-            <not>
-                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
-            </not>
-        </condition>
-    </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
-        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
-            <isfalse value="${annotation.processing.run.all.processors}"/>
-        </condition>
-        <condition else="" property="ap.proc.none.internal" value="-proc:none">
-            <isfalse value="${annotation.processing.enabled}"/>
-        </condition>
-    </target>
-    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
-        <property name="ap.cmd.line.internal" value=""/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
-    <!--
-                ===================
-                COMPILATION SECTION
-                ===================
-            -->
-    <target name="-deps-jar-init" unless="built-jar.properties">
-        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
-        <delete file="${built-jar.properties}" quiet="true"/>
-    </target>
-    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-        <echo level="warn" message="Cycle detected: CeliServer was already built"/>
-    </target>
-    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
-        <mkdir dir="${build.dir}"/>
-        <touch file="${built-jar.properties}" verbose="false"/>
-        <property file="${built-jar.properties}" prefix="already.built.jar."/>
-        <antcall target="-warn-already-built-jar"/>
-        <propertyfile file="${built-jar.properties}">
-            <entry key="${basedir}" value=""/>
-        </propertyfile>
-    </target>
-    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
-    <target depends="init" name="-check-automatic-build">
-        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
-    </target>
-    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
-        <antcall target="clean"/>
-    </target>
-    <target depends="init,deps-jar" name="-pre-pre-compile">
-        <mkdir dir="${build.classes.dir}"/>
-    </target>
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-depend">
-        <pathconvert property="build.generated.subdirs">
-            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="*"/>
-            </dirset>
-        </pathconvert>
-        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
-        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target if="has.persistence.xml" name="-copy-persistence-xml">
-        <mkdir dir="${build.classes.dir}/META-INF"/>
-        <copy todir="${build.classes.dir}/META-INF">
-            <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
-    <!--
-                ====================
-                JAR BUILDING SECTION
-                ====================
-            -->
-    <target depends="init" name="-pre-pre-jar">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-    </target>
-    <target name="-pre-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <touch file="${tmp.manifest.file}" verbose="false"/>
-    </target>
-    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
-        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
-            <attribute name="Main-Class" value="${main.class}"/>
-        </manifest>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
-        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
-            <attribute name="Profile" value="${javac.profile}"/>
-        </manifest>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
-        <basename file="${application.splash}" property="splashscreen.basename"/>
-        <mkdir dir="${build.classes.dir}/META-INF"/>
-        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
-        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
-            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
-        </manifest>
-    </target>
-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
-        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
-        <echo level="info">To run this application from the command line without Ant, try:</echo>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
-        <j2seproject1:jar manifest="${tmp.manifest.file}"/>
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
-            <isset property="main.class.available"/>
-        </condition>
-        <condition else="debug" property="jar.usage.level" value="info">
-            <isset property="main.class.available"/>
-        </condition>
-        <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
-    </target>
-    <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
-        <delete>
-            <fileset file="${tmp.manifest.file}"/>
-        </delete>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
-    <target name="-post-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
-    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
-    <!--
-                =================
-                EXECUTION SECTION
-                =================
-            -->
-    <target depends="init,compile" description="Run a main class." name="run">
-        <j2seproject1:java>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <target name="-do-not-recompile">
-        <property name="javac.includes.binary" value=""/>
-    </target>
-    <target depends="init,compile-single" name="run-single">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}"/>
-    </target>
-    <target depends="init,compile-test-single" name="run-test-with-main">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
-    </target>
-    <!--
-                =================
-                DEBUGGING SECTION
-                =================
-            -->
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
-        <j2seproject1:nbjpdastart name="${debug.class}"/>
-    </target>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
-    </target>
-    <target depends="init,compile" name="-debug-start-debuggee">
-        <j2seproject3:debug>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
-        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-    </target>
-    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}"/>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
-    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
-    </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
-    <target depends="init" name="-pre-debug-fix">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
-        <j2seproject1:nbjpdareload/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
-    <!--
-                =================
-                PROFILING SECTION
-                =================
-            -->
-    <!--
-                pre NB7.2 profiler integration
-            -->
-    <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile/>
-    </target>
-    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
-        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile classname="${profile.class}"/>
-    </target>
-    <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </profile>
-    </target>
-    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
-            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-            <jvmarg value="${profiler.info.jvmargs.agent}"/>
-            <jvmarg line="${profiler.info.jvmargs}"/>
-            <test name="${profile.class}"/>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-            <syspropertyset>
-                <propertyref prefix="test-sys-prop."/>
-                <mapper from="test-sys-prop.*" to="*" type="glob"/>
-            </syspropertyset>
-            <formatter type="brief" usefile="false"/>
-            <formatter type="xml"/>
-        </junit>
-    </target>
-    <!--
-                end of pre NB72 profiling section
-            -->
-    <target if="netbeans.home" name="-profile-check">
-        <condition property="profiler.configured">
-            <or>
-                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
-                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
-            </or>
-        </condition>
-    </target>
-    <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
-        <startprofiler/>
-        <antcall target="run"/>
-    </target>
-    <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <startprofiler/>
-        <antcall target="run-single"/>
-    </target>
-    <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
-    <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <startprofiler/>
-        <antcall target="test-single"/>
-    </target>
-    <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <startprofiler/>
-        <antcall target="run-test-with-main"/>
-    </target>
-    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <startprofiler/>
-        <antcall target="run-applet"/>
-    </target>
-    <!--
-                ===============
-                JAVADOC SECTION
-                ===============
-            -->
-    <target depends="init" if="have.sources" name="-javadoc-build">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
-            <and>
-                <isset property="endorsed.classpath.cmd.line.arg"/>
-                <not>
-                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <condition else="" property="bug5101868workaround" value="*.java">
-            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
-        </condition>
-        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="**/*.java"/>
-                <exclude name="*.java"/>
-            </fileset>
-            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
-        </javadoc>
-        <copy todir="${dist.javadoc.dir}">
-            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="**/doc-files/**"/>
-            </fileset>
-        </copy>
-    </target>
-    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
-    <!--
-                =========================
-                TEST COMPILATION SECTION
-                =========================
-            -->
-    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
-        <mkdir dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-pre-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-    </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
-    <target name="-pre-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
-    <!--
-                =======================
-                TEST EXECUTION SECTION
-                =======================
-            -->
-    <target depends="init" if="have.tests" name="-pre-test-run">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init" if="have.tests" name="test-report"/>
-    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
-    <target depends="init" if="have.tests" name="-pre-test-run-single">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
-        <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
-        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-        <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
-    <!--
-                =======================
-                TEST DEBUGGING SECTION
-                =======================
-            -->
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
-    </target>
-    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
-    </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
-    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
-        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
-    <!--
-                =========================
-                APPLET EXECUTION SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" name="run-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject1:java classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <!--
-                =========================
-                APPLET DEBUGGING  SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
-    <!--
-                ===============
-                CLEANUP SECTION
-                ===============
-            -->
-    <target name="-deps-clean-init" unless="built-clean.properties">
-        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
-        <delete file="${built-clean.properties}" quiet="true"/>
-    </target>
-    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-        <echo level="warn" message="Cycle detected: CeliServer was already built"/>
-    </target>
-    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
-        <mkdir dir="${build.dir}"/>
-        <touch file="${built-clean.properties}" verbose="false"/>
-        <property file="${built-clean.properties}" prefix="already.built.clean."/>
-        <antcall target="-warn-already-built-clean"/>
-        <propertyfile file="${built-clean.properties}">
-            <entry key="${basedir}" value=""/>
-        </propertyfile>
-    </target>
-    <target depends="init" name="-do-clean">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
-    <target name="-check-call-dep">
-        <property file="${call.built.properties}" prefix="already.built."/>
-        <condition property="should.call.dep">
-            <and>
-                <not>
-                    <isset property="already.built.${call.subproject}"/>
-                </not>
-                <available file="${call.script}"/>
-            </and>
-        </condition>
-    </target>
-    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
-        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
-            <propertyset>
-                <propertyref prefix="transfer."/>
-                <mapper from="transfer.*" to="*" type="glob"/>
-            </propertyset>
-        </ant>
-    </target>
-</project>
diff --git a/CeliServer/nbproject/genfiles.properties b/CeliServer/nbproject/genfiles.properties
deleted file mode 100644
index 596e9323c..000000000
--- a/CeliServer/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=91fa77fc
-build.xml.script.CRC32=349e59aa
-build.xml.stylesheet.CRC32=8064a381@1.80.1.48
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=91fa77fc
-nbproject/build-impl.xml.script.CRC32=65c92b32
-nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
diff --git a/CeliServer/nbproject/private/private.properties b/CeliServer/nbproject/private/private.properties
deleted file mode 100644
index 9fafc849e..000000000
--- a/CeliServer/nbproject/private/private.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-compile.on.save=true
-user.properties.file=C:\\Users\\Gerry\\AppData\\Roaming\\NetBeans\\8.2\\build.properties
diff --git a/CeliServer/nbproject/private/private.xml b/CeliServer/nbproject/private/private.xml
deleted file mode 100644
index 0fb791030..000000000
--- a/CeliServer/nbproject/private/private.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group>
-            <file>file:/C:/Users/Gerry/Documents/NetBeansProjects/CeliServer/src/celiserver/CeliServer.java</file>
-            <file>file:/C:/Users/Gerry/Documents/NetBeansProjects/CeliServer/src/celiserver/CeliClient.java</file>
-        </group>
-    </open-files>
-</project-private>
diff --git a/CeliServer/nbproject/project.properties b/CeliServer/nbproject/project.properties
deleted file mode 100644
index 1bed5f432..000000000
--- a/CeliServer/nbproject/project.properties
+++ /dev/null
@@ -1,74 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.processor.options=
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# Files in build.classes.dir which should be excluded from distribution jar
-dist.archive.excludes=
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/CeliServer.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-excludes=
-includes=**
-jar.compress=false
-javac.classpath=
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.external.vm=true
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.8
-javac.target=1.8
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-main.class=celiserver.CeliServer
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=default_platform
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test
diff --git a/CeliServer/nbproject/project.xml b/CeliServer/nbproject/project.xml
deleted file mode 100644
index ae02b1db9..000000000
--- a/CeliServer/nbproject/project.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>CeliServer</name>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>
diff --git a/CeliServer/src/celiserver/CeliServer.java b/CeliServer/src/celiserver/CeliServer.java
deleted file mode 100644
index ada0fe0bc..000000000
--- a/CeliServer/src/celiserver/CeliServer.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package celiserver;
-
-import celiserver.model.Device;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-	
-/**
- *
- * @author Gerry
- */
-public class CeliServer {
-    public static int PORT = 8080;
-    
-    public static void main(String[] args) {
-        ServerSocket server = null;
-        
-        if (args.length > 0) {
-            PORT = Integer.parseInt(args[0]);
-        }
-        
-        try {
-            server = new ServerSocket(PORT);
-            System.out.println("WebServer[" + server.getLocalPort() + "] has started.\r\nWaiting for a connection...");
-            
-            while (true) {
-                Socket client = server.accept();
-                System.out.println("A client connected.");
-
-                Device device = new Device(client);
-                
-                if (device.handshake()) {
-                    device.start();
-                }
-            }
-        } catch (IOException ex) {
-            Logger.getLogger(CeliServer.class.getName()).log(Level.SEVERE, null, ex);
-        } finally {
-            if (server != null) {
-                try {
-                    server.close();
-                } catch (IOException ex) {
-                    // ignored
-                }   
-            }
-        }
-        
-        System.out.println("WebServer has stopped.");
-    }
-    
-    public static abstract class MessageListener extends Thread {
-
-        protected final InputStream in;
-        protected final OutputStream out;
-        protected final InetAddress addr;
-        
-        protected boolean handshakeDone = false;
-    
-        public MessageListener(InputStream inputStream, OutputStream outputStream, InetAddress address) {
-            this.in = inputStream;
-            this.out = outputStream;
-            this.addr = address;
-        }
-        
-        @Override
-        public void run() {
-            System.out.println("MessageListener[" + this.addr + "] started.");
-            
-            byte[] encoded = new byte[64];
-            
-            try {
-                while (isAlive() && handshakeDone) {
-                    int len = in.read(encoded);
-                    if (len <= 0) {
-                        handshakeDone = false;
-                        continue;
-                    }
-                    
-                    byte[] decoded = new byte[encoded[1] - (byte) 128];
-                    byte[] key = new byte[] { encoded[2], encoded[3], encoded[4], encoded[5] };
-                    
-                    for (int i = 6; i < len; i++) {
-                        decoded[i - 6] = (byte) (encoded[i] ^ key[(i - 6) & 0x3]);
-                    }
-                    
-                    String response = handleMessage(new String(decoded, 0, len - 6));
-                    
-                    if (response != null) {
-                        decoded = response.getBytes();
-                        len = decoded.length + 2;
-
-                        encoded[0] = (byte) 0x81;
-                        encoded[1] = (byte) decoded.length;
-
-                        for (int i = 2; i < len; i++) {
-                            encoded[i] = decoded[i - 2];
-                        }
-
-                        out.write(encoded, 0, len);
-                    }
-                }
-            } catch (IOException ex) {
-                Logger.getLogger(MessageListener.class.getName()).log(Level.SEVERE, null, ex);
-            }
-            finally
-            {
-                cleanup();
-            }
-            
-            System.out.println("MessageListener[" + this.addr.toString() + "] stopped.");
-        }
-        
-        protected abstract String handleMessage(String message);
-        protected abstract void cleanup();
-    }
-}
diff --git a/CeliServer/src/celiserver/model/Device.java b/CeliServer/src/celiserver/model/Device.java
deleted file mode 100644
index 0fc33a293..000000000
--- a/CeliServer/src/celiserver/model/Device.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package celiserver.model;
-
-import celiserver.CeliServer;
-import celiserver.ui.MainFrame;
-import java.io.IOException;
-import java.net.Socket;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Base64;
-import java.util.Scanner;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- *
- * @author Gerry
- */
-public class Device extends CeliServer.MessageListener {
-      
-    public static final char COLOR_MODE = '1';
-    public static final char DAYTIME_SET = '2';
-    public static final char ENTRY_DONE = '3';
-    
-    private final Socket socket;
-    private final Gear gear = new Gear();
-    private final SimulationState state = new SimulationState(gear);
-    private final MainFrame frame = new MainFrame(this);
-    
-    public Device(Socket socket) throws IOException {
-        super(socket.getInputStream(), socket.getOutputStream(), socket.getInetAddress());
-        this.socket = socket;
-        this.frame.setTitle(socket.getInetAddress().getHostAddress());
-    }
-
-    @Override
-    protected void cleanup() {
-        frame.setVisible(false);
-    }
-    
-    public boolean handshake() {
-        if (handshakeDone == true) {
-            return true;
-        }
-        
-        Scanner s = new Scanner(in, "UTF-8");
-        String data = s.useDelimiter("\\r\\n\\r\\n").next();
-        Matcher get = Pattern.compile("^GET").matcher(data);
-
-        if (get.find()) {
-            try {
-                Matcher match = Pattern.compile("Sec-WebSocket-Key: (.*)").matcher(data);
-                match.find();
-                
-                byte[] response = ("HTTP/1.1 101 Switching Protocols\r\n"
-                        + "Connection: Upgrade\r\n"
-                        + "Upgrade: websocket\r\n"
-                        + "Sec-WebSocket-Accept: "
-                        + Base64.getEncoder().encodeToString(MessageDigest.getInstance("SHA-1").digest((match.group(1) + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11").getBytes("UTF-8")))
-                        + "\r\n\r\n").getBytes("UTF-8");
-                out.write(response, 0, response.length);
-                out.flush();
-                
-                handshakeDone = true;
-            } catch (NoSuchAlgorithmException | IOException ex) {
-                Logger.getLogger(Device.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        }
-        
-        frame.setVisible(handshakeDone);
-        return handshakeDone;
-    }
-
-    @Override
-    public String handleMessage(String message) {
-        if (message.startsWith("link")) {
-            return gear.link(message.split(" ")[1]) ? "linked" : "unlinked";
-        }
-        else if (message.startsWith("msg")) {
-            performAction(message.split(" ")[1]);
-        }
-        else if (message.startsWith("unlink")) {
-            gear.unlink();
-            return "unlinked";
-        } else if (message.equals("disconnect")) {
-            try {
-                socket.close();
-            } catch (IOException ex) {
-                Logger.getLogger(Device.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        } else {
-            System.err.println("unknown: " + message);
-        }
-        
-        return null;
-    }
-    
-    public void performAction(String action) {
-        System.out.println("Device[" + this.addr.getHostAddress() + "]: " + action);
-        
-        char code = action.charAt(0);
-        char value = action.charAt(1);
-        
-        switch (code) {
-            case COLOR_MODE: {
-                state.setColorMode(value);
-                break;
-            }
-            case DAYTIME_SET: {
-                state.setDayTime(value);
-                break;
-            }
-            case ENTRY_DONE: {
-                state.setEntry(value);
-                break;
-            }
-        }
-    }
-    
-    private static class SimulationState {
-        private final Gear gear;
-        
-        private char colorMode;
-        private char dayTime;
-        private boolean emotionDone;
-        private int mealCount;
-        private boolean symptomDone;
-        
-        public SimulationState(Gear gear) {
-            this.gear = gear;
-        }
-        
-        private void setColorMode(char value) {
-            colorMode = value;            
-            gear.send(getColor());
-        }
-        
-        private void setDayTime(char value) {
-            dayTime = value;
-            gear.send(getColor());
-        }
-        
-        private void setEntry(char value) {
-            switch (value) {
-                case Entry.EMOTION: {
-                    if (emotionDone) {
-                        return;
-                    }
-                    
-                    emotionDone = true;
-                    break;
-                }
-                case Entry.MEAL: {
-                    if (mealCount >= 3) {
-                        return;
-                    }
-                    
-                    mealCount++;
-                    break;
-                }
-                case Entry.SYMPTOM: {
-                    if (symptomDone) {
-                        return;
-                    }
-                    
-                    symptomDone = true;
-                    break;
-                }
-                case Entry.RESET: {
-                    mealCount = 0;
-                    emotionDone = false;
-                    symptomDone = false;
-                    break;
-                }
-                default: {
-                    return;
-                }
-            }
-            
-            gear.send(getColor());
-        }
-        
-        private char getColor() {
-            int entries = mealCount;
-            //entries += emotionDone ? 1 : 0;
-            //entries += symptomDone ? 1 : 0;
-            entries += (emotionDone || symptomDone) ? 1 : 0;
-            
-            if (colorMode == ColorMode.RED_TO_GREEN) {
-                if (dayTime == DayTime.NIGHT) {
-                    return Color.BLACK;
-                }
-                
-                // fallback
-                if (entries < 0) {
-                    entries = 0;
-                } else if (entries > 4) {
-                    entries = 4;
-                }
-            } else if (colorMode == ColorMode.GREEN_TO_RED) {
-                entries += 4;       // "Bonus"
-                
-                switch (dayTime) {
-                    case DayTime.MORNING: {
-                        break;
-                    }
-                    case DayTime.FORENOON: {
-                        entries -= 1;
-                        break;
-                    }
-                    case DayTime.NOON: {
-                        entries -= 2;
-                        break;
-                    }
-                    case DayTime.AFTERNOON: {
-                        entries -= 3;
-                        break;
-                    }
-                    case DayTime.EVENING: {
-                        entries -= 4;
-                        break;
-                    }
-                    case DayTime.NIGHT: {
-                        return Color.BLACK;
-                    }
-                }
-                
-                // fallback
-                if (entries < 0) {
-                    entries = 0;
-                } else if (entries > 4) {
-                    entries = 4;
-                }
-            } // -- end if (colorMode)
-            
-            switch (entries) {
-                case 0: return Color.RED;
-                case 1: return Color.LIGHT_RED;
-                case 2: return Color.ORANGE;
-                case 3: return Color.LIGHT_GREEN;
-                case 4: return Color.GREEN;
-                default: return Color.BLACK;
-            }
-        }
-    }
-    
-    
-    private static class ColorMode {
-        public static final char RED_TO_GREEN = '0';
-        public static final char GREEN_TO_RED = '1';
-    }
-    
-    private static class Color {
-        public static final char BLACK = '0';        
-        public static final char GREEN = '1';
-        public static final char LIGHT_GREEN = '2';
-        //public static final char YELLOW = '3';
-        public static final char ORANGE = '4';
-        public static final char LIGHT_RED = '5';
-        public static final char RED = '6';
-    }
-    
-    private static class DayTime {
-        public static final char MORNING = '0';
-        public static final char FORENOON = '1';
-        public static final char NOON = '2';
-        public static final char AFTERNOON = '3';
-        public static final char EVENING = '4';
-        public static final char NIGHT = '5';
-    }
-    
-    private static class Entry {
-        /** @deprecated debug only */
-        public static final char RESET = '~';
-        public static final char EMOTION = '0';
-        public static final char MEAL = '1';
-        public static final char SYMPTOM = '2';
-    }
-}
diff --git a/CeliServer/src/celiserver/model/Gear.java b/CeliServer/src/celiserver/model/Gear.java
deleted file mode 100644
index ab4afd008..000000000
--- a/CeliServer/src/celiserver/model/Gear.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package celiserver.model;
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetSocketAddress;
-import java.net.SocketException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- *
- * @author Gerry
- */
-public class Gear {
-    private DatagramSocket host = null;
-    
-    public boolean link(String host) {
-        try {
-            String[] split = host.split(":");
-            this.host = new DatagramSocket();
-            this.host.connect(new InetSocketAddress(split[0], Integer.parseInt(split[1])));
-            System.out.println("Gear[" + this.host.getRemoteSocketAddress() + "] linked.");
-            return true;
-        } catch (NumberFormatException | SocketException ex) {
-            Logger.getLogger(Gear.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        return false;
-    }
-
-    public void unlink() {
-        if (this.host == null) {
-            return;
-        }
-        
-        System.out.println("Gear[" + this.host.getRemoteSocketAddress() + "] unlinked.");
-        this.host.disconnect();
-        this.host = null;
-    }
-    
-    public void send(char character) {
-        send(String.valueOf(character));
-    }
-    
-    public void send(String message) {
-        if (host == null) {
-            System.out.println("Gear[UNLINKED]: " + message);
-
-            return;
-        }
-        
-        System.out.println("Gear[" + this.host.getRemoteSocketAddress() + "]: " + message);
-        
-        byte[] msg = message.getBytes();
-        DatagramPacket packet = new DatagramPacket(msg, 0, msg.length);
-
-        try {
-            host.send(packet);
-        } catch (IOException ex) {
-            Logger.getLogger(Gear.class.getName()).log(Level.SEVERE, null, ex);
-        }
-    }
-}
diff --git a/CeliServer/src/celiserver/ui/MainFrame.form b/CeliServer/src/celiserver/ui/MainFrame.form
deleted file mode 100644
index cddaa6221..000000000
--- a/CeliServer/src/celiserver/ui/MainFrame.form
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
-  <NonVisualComponents>
-    <Component class="javax.swing.ButtonGroup" name="btnGroupColorMode">
-    </Component>
-    <Component class="javax.swing.ButtonGroup" name="btnGroupDayTime">
-    </Component>
-  </NonVisualComponents>
-  <Properties>
-    <Property name="defaultCloseOperation" type="int" value="0"/>
-    <Property name="alwaysOnTop" type="boolean" value="true"/>
-  </Properties>
-  <SyntheticProperties>
-    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
-    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
-  </SyntheticProperties>
-  <Events>
-    <EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowClosing"/>
-  </Events>
-  <AuxValues>
-    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
-    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
-    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-  </AuxValues>
-
-  <Layout>
-    <DimensionLayout dim="0">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="btnNewDay" max="32767" attributes="0"/>
-                  <Group type="102" attributes="0">
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/>
-                          <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
-                          <Group type="102" attributes="0">
-                              <EmptySpace min="10" pref="10" max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="btnColorMode_redToGreen" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Group type="103" alignment="0" groupAlignment="0" attributes="0">
-                                      <Component id="btnDayTime_evening" alignment="0" min="-2" max="-2" attributes="0"/>
-                                      <Group type="103" alignment="1" groupAlignment="0" attributes="0">
-                                          <Component id="btnDayTime_morning" alignment="0" min="-2" max="-2" attributes="0"/>
-                                          <Component id="btnDayTime_noon" alignment="0" min="-2" max="-2" attributes="0"/>
-                                      </Group>
-                                  </Group>
-                              </Group>
-                              <EmptySpace type="separate" max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Group type="103" groupAlignment="1" attributes="0">
-                                      <Component id="btnDayTime_night" alignment="0" min="-2" max="-2" attributes="0"/>
-                                      <Group type="103" alignment="1" groupAlignment="0" attributes="0">
-                                          <Component id="btnDayTime_afternoon" min="-2" max="-2" attributes="0"/>
-                                          <Component id="btnDayTime_forenoon" min="-2" max="-2" attributes="0"/>
-                                      </Group>
-                                  </Group>
-                                  <Component id="btnColorMode_greenToRed" min="-2" max="-2" attributes="0"/>
-                              </Group>
-                          </Group>
-                      </Group>
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-              </Group>
-              <EmptySpace max="-2" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-    <DimensionLayout dim="1">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
-              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="btnColorMode_redToGreen" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="btnColorMode_greenToRed" alignment="3" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace min="-2" pref="22" max="-2" attributes="0"/>
-              <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="btnDayTime_morning" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="btnDayTime_forenoon" alignment="3" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="btnDayTime_noon" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="btnDayTime_afternoon" alignment="3" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="btnDayTime_evening" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="btnDayTime_night" alignment="3" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace type="separate" max="-2" attributes="0"/>
-              <Component id="btnNewDay" min="-2" max="-2" attributes="0"/>
-              <EmptySpace max="32767" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-  </Layout>
-  <SubComponents>
-    <Component class="javax.swing.JLabel" name="jLabel1">
-      <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="18" style="1"/>
-        </Property>
-        <Property name="text" type="java.lang.String" value="ColorMode:"/>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JLabel" name="jLabel2">
-      <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="18" style="1"/>
-        </Property>
-        <Property name="text" type="java.lang.String" value="DayTime:"/>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JRadioButton" name="btnColorMode_redToGreen">
-      <Properties>
-        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
-          <ComponentRef name="btnGroupColorMode"/>
-        </Property>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="18" style="0"/>
-        </Property>
-        <Property name="text" type="java.lang.String" value="Red to Green"/>
-        <Property name="actionCommand" type="java.lang.String" value="0"/>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JRadioButton" name="btnColorMode_greenToRed">
-      <Properties>
-        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
-          <ComponentRef name="btnGroupColorMode"/>
-        </Property>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="18" style="0"/>
-        </Property>
-        <Property name="text" type="java.lang.String" value="Green to Red"/>
-        <Property name="actionCommand" type="java.lang.String" value="1"/>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JRadioButton" name="btnDayTime_morning">
-      <Properties>
-        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
-          <ComponentRef name="btnGroupDayTime"/>
-        </Property>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="18" style="0"/>
-        </Property>
-        <Property name="text" type="java.lang.String" value="Morning"/>
-        <Property name="actionCommand" type="java.lang.String" value="0"/>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JRadioButton" name="btnDayTime_forenoon">
-      <Properties>
-        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
-          <ComponentRef name="btnGroupDayTime"/>
-        </Property>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="18" style="0"/>
-        </Property>
-        <Property name="text" type="java.lang.String" value="Forenoon"/>
-        <Property name="actionCommand" type="java.lang.String" value="1"/>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JRadioButton" name="btnDayTime_noon">
-      <Properties>
-        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
-          <ComponentRef name="btnGroupDayTime"/>
-        </Property>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="18" style="0"/>
-        </Property>
-        <Property name="text" type="java.lang.String" value="Noon"/>
-        <Property name="actionCommand" type="java.lang.String" value="2"/>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JRadioButton" name="btnDayTime_afternoon">
-      <Properties>
-        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
-          <ComponentRef name="btnGroupDayTime"/>
-        </Property>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="18" style="0"/>
-        </Property>
-        <Property name="text" type="java.lang.String" value="Afternoon"/>
-        <Property name="actionCommand" type="java.lang.String" value="3"/>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JRadioButton" name="btnDayTime_evening">
-      <Properties>
-        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
-          <ComponentRef name="btnGroupDayTime"/>
-        </Property>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="18" style="0"/>
-        </Property>
-        <Property name="text" type="java.lang.String" value="Evening"/>
-        <Property name="actionCommand" type="java.lang.String" value="4"/>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JRadioButton" name="btnDayTime_night">
-      <Properties>
-        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
-          <ComponentRef name="btnGroupDayTime"/>
-        </Property>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="18" style="0"/>
-        </Property>
-        <Property name="text" type="java.lang.String" value="Night"/>
-        <Property name="actionCommand" type="java.lang.String" value="5"/>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JButton" name="btnNewDay">
-      <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="18" style="1"/>
-        </Property>
-        <Property name="text" type="java.lang.String" value="Reset Entries"/>
-      </Properties>
-    </Component>
-  </SubComponents>
-</Form>
diff --git a/CeliServer/src/celiserver/ui/MainFrame.java b/CeliServer/src/celiserver/ui/MainFrame.java
deleted file mode 100644
index d6c088f41..000000000
--- a/CeliServer/src/celiserver/ui/MainFrame.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package celiserver.ui;
-
-import celiserver.model.Device;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import javax.swing.AbstractButton;
-
-/**
- *
- * @author Gerry
- */
-public class MainFrame extends javax.swing.JFrame {
-
-    /** The device behind this control. */
-    private final Device device;
-    
-    /**
-     * Creates new form MainFrame
-     */
-    public MainFrame() {
-        this(null);
-    }
-    
-    public MainFrame(Device device) {
-        initComponents();
-        this.device = device;
-        
-        ActionListener colorModeListener = (ActionEvent ae) -> {
-            AbstractButton radio = (AbstractButton) ae.getSource();
-            device.performAction("1" + radio.getActionCommand());
-        };
-        
-        ActionListener dayTimeListener = (ActionEvent ae) -> {
-            AbstractButton radio = (AbstractButton) ae.getSource();
-            device.performAction("2" + radio.getActionCommand());
-        };
-        
-        btnColorMode_redToGreen.addActionListener(colorModeListener);
-        btnColorMode_greenToRed.addActionListener(colorModeListener);
-        
-        btnDayTime_morning.addActionListener(dayTimeListener);
-        btnDayTime_forenoon.addActionListener(dayTimeListener);
-        btnDayTime_noon.addActionListener(dayTimeListener);
-        btnDayTime_afternoon.addActionListener(dayTimeListener);
-        btnDayTime_evening.addActionListener(dayTimeListener);
-        btnDayTime_night.addActionListener(dayTimeListener);
-        
-        btnNewDay.addActionListener((ae) -> {
-            device.performAction("3~");
-        });
-    }
-
-    /**
-     * This method is called from within the constructor to initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is always
-     * regenerated by the Form Editor.
-     */
-    @SuppressWarnings("unchecked")
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents() {
-
-        btnGroupColorMode = new javax.swing.ButtonGroup();
-        btnGroupDayTime = new javax.swing.ButtonGroup();
-        jLabel1 = new javax.swing.JLabel();
-        jLabel2 = new javax.swing.JLabel();
-        btnColorMode_redToGreen = new javax.swing.JRadioButton();
-        btnColorMode_greenToRed = new javax.swing.JRadioButton();
-        btnDayTime_morning = new javax.swing.JRadioButton();
-        btnDayTime_forenoon = new javax.swing.JRadioButton();
-        btnDayTime_noon = new javax.swing.JRadioButton();
-        btnDayTime_afternoon = new javax.swing.JRadioButton();
-        btnDayTime_evening = new javax.swing.JRadioButton();
-        btnDayTime_night = new javax.swing.JRadioButton();
-        btnNewDay = new javax.swing.JButton();
-
-        setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE);
-        setAlwaysOnTop(true);
-        addWindowListener(new java.awt.event.WindowAdapter() {
-            public void windowClosing(java.awt.event.WindowEvent evt) {
-                formWindowClosing(evt);
-            }
-        });
-
-        jLabel1.setFont(new java.awt.Font("Tahoma", 1, 18)); // NOI18N
-        jLabel1.setText("ColorMode:");
-
-        jLabel2.setFont(new java.awt.Font("Tahoma", 1, 18)); // NOI18N
-        jLabel2.setText("DayTime:");
-
-        btnGroupColorMode.add(btnColorMode_redToGreen);
-        btnColorMode_redToGreen.setFont(new java.awt.Font("Tahoma", 0, 18)); // NOI18N
-        btnColorMode_redToGreen.setText("Red to Green");
-        btnColorMode_redToGreen.setActionCommand("0");
-
-        btnGroupColorMode.add(btnColorMode_greenToRed);
-        btnColorMode_greenToRed.setFont(new java.awt.Font("Tahoma", 0, 18)); // NOI18N
-        btnColorMode_greenToRed.setText("Green to Red");
-        btnColorMode_greenToRed.setActionCommand("1");
-
-        btnGroupDayTime.add(btnDayTime_morning);
-        btnDayTime_morning.setFont(new java.awt.Font("Tahoma", 0, 18)); // NOI18N
-        btnDayTime_morning.setText("Morning");
-        btnDayTime_morning.setActionCommand("0");
-
-        btnGroupDayTime.add(btnDayTime_forenoon);
-        btnDayTime_forenoon.setFont(new java.awt.Font("Tahoma", 0, 18)); // NOI18N
-        btnDayTime_forenoon.setText("Forenoon");
-        btnDayTime_forenoon.setActionCommand("1");
-
-        btnGroupDayTime.add(btnDayTime_noon);
-        btnDayTime_noon.setFont(new java.awt.Font("Tahoma", 0, 18)); // NOI18N
-        btnDayTime_noon.setText("Noon");
-        btnDayTime_noon.setActionCommand("2");
-
-        btnGroupDayTime.add(btnDayTime_afternoon);
-        btnDayTime_afternoon.setFont(new java.awt.Font("Tahoma", 0, 18)); // NOI18N
-        btnDayTime_afternoon.setText("Afternoon");
-        btnDayTime_afternoon.setActionCommand("3");
-
-        btnGroupDayTime.add(btnDayTime_evening);
-        btnDayTime_evening.setFont(new java.awt.Font("Tahoma", 0, 18)); // NOI18N
-        btnDayTime_evening.setText("Evening");
-        btnDayTime_evening.setActionCommand("4");
-
-        btnGroupDayTime.add(btnDayTime_night);
-        btnDayTime_night.setFont(new java.awt.Font("Tahoma", 0, 18)); // NOI18N
-        btnDayTime_night.setText("Night");
-        btnDayTime_night.setActionCommand("5");
-
-        btnNewDay.setFont(new java.awt.Font("Tahoma", 1, 18)); // NOI18N
-        btnNewDay.setText("Reset Entries");
-
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
-        getContentPane().setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(btnNewDay, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addGroup(layout.createSequentialGroup()
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jLabel2)
-                            .addComponent(jLabel1)
-                            .addGroup(layout.createSequentialGroup()
-                                .addGap(10, 10, 10)
-                                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(btnColorMode_redToGreen)
-                                    .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                        .addComponent(btnDayTime_evening)
-                                        .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                            .addComponent(btnDayTime_morning)
-                                            .addComponent(btnDayTime_noon))))
-                                .addGap(18, 18, 18)
-                                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                                        .addComponent(btnDayTime_night, javax.swing.GroupLayout.Alignment.LEADING)
-                                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                            .addComponent(btnDayTime_afternoon)
-                                            .addComponent(btnDayTime_forenoon)))
-                                    .addComponent(btnColorMode_greenToRed))))
-                        .addGap(0, 0, Short.MAX_VALUE)))
-                .addContainerGap())
-        );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
-                .addComponent(jLabel1)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(btnColorMode_redToGreen)
-                    .addComponent(btnColorMode_greenToRed))
-                .addGap(22, 22, 22)
-                .addComponent(jLabel2)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(btnDayTime_morning)
-                    .addComponent(btnDayTime_forenoon))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(btnDayTime_noon)
-                    .addComponent(btnDayTime_afternoon))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(btnDayTime_evening)
-                    .addComponent(btnDayTime_night))
-                .addGap(18, 18, 18)
-                .addComponent(btnNewDay)
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-        );
-
-        pack();
-    }// </editor-fold>//GEN-END:initComponents
-
-    private void formWindowClosing(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowClosing
-        if (this.device != null) {
-            this.device.handleMessage("disconnect");
-        }
-    }//GEN-LAST:event_formWindowClosing
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JRadioButton btnColorMode_greenToRed;
-    private javax.swing.JRadioButton btnColorMode_redToGreen;
-    private javax.swing.JRadioButton btnDayTime_afternoon;
-    private javax.swing.JRadioButton btnDayTime_evening;
-    private javax.swing.JRadioButton btnDayTime_forenoon;
-    private javax.swing.JRadioButton btnDayTime_morning;
-    private javax.swing.JRadioButton btnDayTime_night;
-    private javax.swing.JRadioButton btnDayTime_noon;
-    private javax.swing.ButtonGroup btnGroupColorMode;
-    private javax.swing.ButtonGroup btnGroupDayTime;
-    private javax.swing.JButton btnNewDay;
-    private javax.swing.JLabel jLabel1;
-    private javax.swing.JLabel jLabel2;
-    // End of variables declaration//GEN-END:variables
-}
diff --git a/NeoPixel/Farbwechsel_UX_LED_v3.0.ino b/NeoPixel/Farbwechsel_UX_LED_v3.0.ino
deleted file mode 100644
index a7aa1c384..000000000
--- a/NeoPixel/Farbwechsel_UX_LED_v3.0.ino
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * WiFi UDP Server for NeoPixel Control
- * 
- * A simple udp server using WiFi Provisioning setup and UDP to control NeoPixel
- * 
- * Don't light up all lights in white, as this will use too much power (external power and logic level converters would be needed then).
- * Valid UDP Packets: 0...Off, 1...5 different Color effects
- * 
- * Version: 1.0, 20191022 (Walter)
- */
-
-#include <SPI.h>
-#include <WiFi101.h>
-#include <WiFiMDNSResponder.h>
-#include <Adafruit_NeoPixel.h>
-
-const int neoPin = 6;
-const int numPixels = 47;
-
-const int ledPin = 13; // LED pin for connectivity status indicator
-
-char mdnsName[] = "celiwheel"; // the MDNS name that the board will respond to
-                               // after WiFi settings have been provisioned
-
-
-Adafruit_NeoPixel pixel = Adafruit_NeoPixel(numPixels, neoPin);
-
-WiFiUDP udpServer;
-
-char packetBuffer[255]; //buffer to hold incoming packet
-char ack[] = "ack";       // a string to send back
-int  port = 20000;
-
-//wheels go in opposite directions with indices, therefore use these indirect indices instead
-int ind[] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,40,41,42,43,44,45,46};
-
-
-//NeoPixel animation state
-uint8_t red = 255;
-uint8_t green = 255;
-uint8_t blue = 255;
-uint8_t colour = 0;
-int pos = 0, dir = 1; // Position, direction of "eye" for larson scanner animation
-
-int bri = 100;
-
-#define DELAYVAL 2200 // Time (in milliseconds) to pause between pixels
-#define DELAYVAL2 25// Create a MDNS responder to listen and respond to MDNS name requests.
-
-WiFiMDNSResponder mdnsResponder;
-
-void setup() {
-  
-  //set pins for feather M0 shield
-  WiFi.setPins(8,7,4,2); 
-
-  //Initialize serial:
-  Serial.begin(9600);
-
-  //init NeoPixel
-  pixel.begin(); // This initializes the NeoPixel library.
-
-  for(uint8_t i=0; i<numPixels; i++) {
-    pixel.setPixelColor(ind[i], pixel.Color(0,0,0)); // off
-  }
-  //colorWipe(pixel.Color(bri, bri, bri), 15); 
-  //colorWipe(pixel.Color(0, 0, 0), 15); 
-  pixel.show();
-
-  // check for the presence of the shield:
-  if (WiFi.status() == WL_NO_SHIELD) {
-    Serial.println("WiFi shield not present");
-    // don't continue:
-    while (true);
-  }
-
-  // configure the LED pin for output mode
-  pinMode(ledPin, OUTPUT);
-
-  // Start in provisioning mode:
-  //  1) This will try to connect to a previously associated access point.
-  //  2) If this fails, an access point named "wifi101-XXXX" will be created, where XXXX
-  //     is the last 4 digits of the boards MAC address. Once you are connected to the access point,
-  //     you can configure an SSID and password by visiting http://wifi101/
-  WiFi.beginProvision();
-
-  while (WiFi.status() != WL_CONNECTED) {
-    // wait while not connected
-
-    // blink the led to show an unconnected status
-    digitalWrite(ledPin, HIGH);
-    delay(500);
-    digitalWrite(ledPin, LOW);
-    delay(500);
-  }
-
-  // connected, make the LED stay on
-  digitalWrite(ledPin, HIGH);
-
-  udpServer.begin(port);
-
-  // Setup the MDNS responder to listen to the configured name.
-  // NOTE: You _must_ call this _after_ connecting to the WiFi network and
-  // being assigned an IP address.
-  if (!mdnsResponder.begin(mdnsName)) {
-    Serial.println("Failed to start MDNS responder!");
-    while(1);
-  }
-
-  Serial.print("Server listening at UDP port ");
-  Serial.print(port);
-  Serial.print(" on ");
-  Serial.print(mdnsName);
-  Serial.println(".local");
-
-  // you're connected now, so print out the status:
-  printWiFiStatus();
-}
-
-
-void loop() {
-  // Call the update() function on the MDNS responder every loop iteration to
-  // make sure it can detect and respond to name requests.
-  mdnsResponder.poll();
-  
-  // if there's data available, read a packet
-  int packetSize = udpServer.parsePacket();
-  if (packetSize)
-  {
-    Serial.print("Received packet of size ");
-    Serial.println(packetSize);
-    Serial.print("From ");
-    IPAddress remoteIp = udpServer.remoteIP();
-    Serial.print(remoteIp);
-    Serial.print(", port ");
-    Serial.println(udpServer.remotePort());
-
-    // read the packet into packetBufffer
-    int len = udpServer.read(packetBuffer, 255);
-    if (len > 0) packetBuffer[len] = 0;
-    Serial.println("Contents:");
-    Serial.println(packetBuffer);
-
-    performCommand();
-
-    // send a reply, to the IP address and port that sent us the packet we received
-    //udpServer.beginPacket(udpServer.remoteIP(), udpServer.remotePort());
-    //udpServer.write(ack);
-    //udpServer.endPacket();
-  }
-
-}
-
-
-void printWiFiStatus() {
-  // print the SSID of the network you're attached to:
-  Serial.print("SSID: ");
-  Serial.println(WiFi.SSID());
-
-  // print your WiFi shield's IP address:
-  IPAddress ip = WiFi.localIP();
-  Serial.print("IP Address: ");
-  Serial.println(ip);
-
-  // print the received signal strength:
-  long rssi = WiFi.RSSI();
-  Serial.print("signal strength (RSSI):");
-  Serial.print(rssi);
-  Serial.println(" dBm");
-}
-
-
-
-void performCommand() {
-  colour = packetBuffer[0] - '0'; // character to int Operation
-for(int i=0; i<numPixels; i++) {
-  switch (colour) {
-    case 0:    
-      pixel.setPixelColor(i, pixel.Color(0, 0, 0)); // schwarz oder aus...
-      pixel.show();     
-      break;
-    case 1:    
-      pixel.setPixelColor(i, pixel.Color(0, 51, 0)); // Grün
-      pixel.show();
-      delay(DELAYVAL2);      
-      break;
-    case 2:   
-      pixel.setPixelColor(i, pixel.Color(30, 51, 0)); // light Grün, Zwischenschritt 1
-      pixel.show();
-      delay(DELAYVAL2);
-      break;
-    case 3:    
-      pixel.setPixelColor(i, pixel.Color(51,30, 0)); // Gelb, Zwischenschritt 3
-      pixel.show();
-      delay(DELAYVAL2);
-      break;
-    case 4:    
-      pixel.setPixelColor(i, pixel.Color(51,30, 0)); // Gelb, Zwischenschritt 3
-      pixel.show();
-      delay(DELAYVAL2);
-      break;
-    case 5:    
-      pixel.setPixelColor(i, pixel.Color(51, 10, 0));// orange, Zwischenschritt 4
-      pixel.show();
-      delay(DELAYVAL2);      
-      break;
-    case 6:    // your hand is nowhere near the sensor // Rot
-      pixel.setPixelColor(i, pixel.Color(51, 0, 0));
-      pixel.show();
-      delay(DELAYVAL2);      
-      break;
-  }
-        
-    
-    
-  }
-   
-   delay(DELAYVAL2);
-   pixel.show();   // Send the updated pixel colors to the hardware.
-   //delay(DELAYVAL); // Pause before next pass through loop
- 
-   //Serial.println(colour);
-
-}
-
-
-//#############   NeoPixel functions
-// Fill the dots one after the other with a color
-void colorWipe(uint32_t c, uint8_t wait) {
-  for(uint16_t i=0; i<numPixels; i++) {
-      pixel.setPixelColor(ind[i], c);
-      pixel.setBrightness(bri);
-      pixel.show();
-      delay(wait);
-  }
-}
-
-void larsonScanner(uint32_t c, uint8_t wait){
-  int j;
-  
-  for(uint16_t i=0; i<numPixels+5; i++) {
-    // Draw 5 pixels centered on pos.  setPixelColor() will clip any
-    // pixels off the ends of the strip, we don't need to watch for that.
-    pixel.setPixelColor(ind[pos - 2], 0x003b85); // Dark red
-    pixel.setPixelColor(ind[pos - 1], 0x005ed2); // Medium red
-    pixel.setPixelColor(ind[pos] , 0x00c0ff); // Center pixel is brightest
-    pixel.setPixelColor(ind[pos + 1], 0x005ed2); // Medium red
-    pixel.setPixelColor(ind[pos + 2], 0x003b85); // Dark red
-    pixel.setBrightness(bri);
-    
-    pixel.show();
-    delay(wait);
-    
-    // Rather than being sneaky and erasing just the tail pixel,
-    // it's easier to erase it all and draw a new one next time.
-    for(j=-2; j<= 2; j++) {
-      pixel.setPixelColor(ind[pos+j], 0);
-    }
-    
-    // Bounce off ends of strip
-    pos += dir;
-    if(pos < 0) {
-      pos = 1;
-      dir = -dir;
-    } else if(pos >= numPixels) {
-      pos = numPixels - 2;
-      dir = -dir;
-    } 
-  } 
-  //colorWipe(pixel.Color(0, 0, 0), 20);
-}
-
-
-
-void flashRandom(int wait, uint8_t howMany) {
- 
-  for(uint16_t i=0; i<howMany; i++) {
-    // get a random pixel from the list
-    int j = random(numPixels);
-    
-    // now we will 'fade' it in 5 steps
-    for (int x=0; x < 5; x++) {
-      int r = red * (x+1); r /= 5;
-      int g = green * (x+1); g /= 5;
-      int b = blue * (x+1); b /= 5;
-      
-      pixel.setPixelColor(ind[j], pixel.Color(r, g, b));
-      pixel.setBrightness(bri);
-      pixel.show();
-      delay(wait);
-    }
-    // & fade out in 5 steps
-    for (int x=5; x >= 0; x--) {
-      int r = red * x; r /= 5;
-      int g = green * x; g /= 5;
-      int b = blue * x; b /= 5;
-      
-      pixel.setPixelColor(ind[j], pixel.Color(r, g, b));
-      pixel.setBrightness(bri);
-      pixel.show();
-      delay(wait);
-    }
-  }
-  // LEDs will be off when done (they are faded to 0)
-}
-
-void rainbow(uint8_t wait) {
-  uint16_t i, j;
-
-  for(j=0; j<256; j++) {
-    for(i=0; i<numPixels; i++) {
-      pixel.setPixelColor(ind[i], wheel((i+j) & 255));
-    }
-    pixel.setBrightness(bri);
-    pixel.show();
-    delay(wait);
-  }
-}
-
-// Slightly different, this makes the rainbow equally distributed throughout
-void rainbowCycle(uint8_t wait) {
-  uint16_t i, j;
-
-  for(j=0; j<256*5; j++) { // 5 cycles of all colors on wheel
-    for(i=0; i< numPixels; i++) {
-      pixel.setPixelColor(ind[i], wheel(((i * 256 / numPixels) + j) & 255));
-    }
-    pixel.setBrightness(bri);
-    pixel.show();
-    delay(wait);
-  }
-}
-
-//Theatre-style crawling lights.
-void theaterChase(uint32_t c, uint8_t wait) {
-  for (int j=0; j<10; j++) {  //do 10 cycles of chasing
-    for (int q=0; q < 3; q++) {
-      for (int i=0; i < numPixels; i=i+3) {
-        pixel.setPixelColor(ind[i+q], c);    //turn every third pixel on
-      }
-      pixel.setBrightness(bri);
-      pixel.show();
-
-      delay(wait);
-
-      for (int i=0; i < numPixels; i=i+3) {
-        pixel.setPixelColor(ind[i+q], 0);        //turn every third pixel off
-      }
-    }
-  }
-}
-
-//Theatre-style crawling lights with rainbow effect
-void theaterChaseRainbow(uint8_t wait) {
-  for (int j=0; j < 256; j++) {     // cycle all 256 colors in the wheel
-    for (int q=0; q < 3; q++) {
-      for (int i=0; i < numPixels; i=i+3) {
-        pixel.setPixelColor(ind[i+q], wheel( (i+j) % 255));    //turn every third pixel on
-      }
-      pixel.setBrightness(bri);
-      pixel.show();
-
-      delay(wait);
-
-      for (int i=0; i < numPixels; i=i+3) {
-        pixel.setPixelColor(ind[i+q], 0);        //turn every third pixel off
-      }
-    }
-  }
-}
-
-// Input a value 0 to 255 to get a color value.
-// The colours are a transition r - g - b - back to r.
-uint32_t wheel(byte wheelPos) {
-  wheelPos = 255 - wheelPos;
-  if(wheelPos < 85) {
-    return pixel.Color(255 - wheelPos * 3, 0, wheelPos * 3);
-  }
-  if(wheelPos < 170) {
-    wheelPos -= 85;
-    return pixel.Color(0, wheelPos * 3, 255 - wheelPos * 3);
-  }
-  wheelPos -= 170;
-  return pixel.Color(wheelPos * 3, 255 - wheelPos * 3, 0);
-}
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..57f862287
--- /dev/null
+++ b/README.md
@@ -0,0 +1,100 @@
+![Project Logo](/.github/logos/combined_logos.png)
+
+# CeliApp
+
+An app to help people with [coeliac disease](https://en.wikipedia.org/wiki/Coeliac_disease) control their intake of gluten.
+
+## Project information
+						  
+[Report bugs here](https://forms.gle/cLYvsLpdG7K9TA6S6)
+
+[Google drive folder](https://drive.google.com/drive/folders/14PHvjDnpShU3ikbmvI3tGRPABUAJEEVm?usp=sharing)
+
+[CeliApp kanban board](https://github.com/itcgames/celiapp/projects/1)
+
+## Developer information
+
+### Prerequisites
+
+Install node & npm [from here](https://nodejs.org/en/)
+
+Install expo-cli :  `npm install -g expo-cli`
+
+Install the Expo client (capable Version 2.16.1 for expo-SDK 35) app on your android/IOS device 
+
+
+## Install & Run
+
+Setup:
+`npm install`
+
+Run:
+`expo start`
+
+Note for windows users: If you get "error Invalid Regular Expression..." error, fix the node 
+dependency as per this article: https://stackoverflow.com/a/58122821/488802
+
+IOS: point camera app at QR code
+Android: In Expo client app, open QR code
+
+## Application Files
+
+```
+celiapp
+    ./package.json		NPM Installation Module
+    ./app.json			Application Configuration
+    ./App.js			Application Entry
+    ./babel.config.js		Babel Configuration File (EXPO)
+    ./docdev/***		Development Documentation Files
+
+celiapp/__tests__
+    ./***-test.js		Application Test Files (JEST)	
+
+celiapp/src/constants
+    ./***.js			Global Configuration Files
+
+celiapp/src/assets
+    ./fonts/***.ttf		Font Ressources
+    ./images/***.png		Image Ressources 
+
+celiapp/src/navigation
+    ./AppNavigator.js		Navigation Logic
+    ./MainTabNavigator.js	Main Navigation
+
+celiapp/src/components
+    ./***.js			Shared Component Library
+    ./android/***.js		Native Android Components
+    ./ios/***.js		Native iOS Components
+
+celiapp/src/screens
+    ./***.js			MainTabNavigator Screens
+    ./***/***.js		Sub Screens, Dialogs, ...
+    
+```
+
+### Tools & Tutorials
+
+* REACT NATIVE: 		https://facebook.github.io/react-native/docs/getting-started
+* EXPO: 			https://expo.io
+* JEST:			https://jestjs.io
+* Android Studio: 	https://developer.android.com/studio
+* Icons Library: 		https://ionicons.com
+* Import Organizer: 	https://github.com/tleunen/babel-plugin-module-resolver
+* Tortoise GitSVN: 	https://tortoisegit.org
+* EXPO-SQLite:		https://github.com/expo/expo/tree/master/packages/expo-sqlite
+
+
+### Useful Git Commands
+
+```
+git pull			update repo from master
+git commit -m "Commit Message"	commit local changes to repo
+git push			push local repo to master
+// ... merge & pull request?
+```
+
+# Usage
+
+```bash
+npm install
+```
diff --git a/Readme.txt b/Readme.txt
deleted file mode 100644
index a3f44575e..000000000
--- a/Readme.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-                         				CELI APP
-   		   				  - All You Could Eat -
-
-##########################################################################################################################
-
-						      Install & Run
-
-Setup:
-"npm install"
-
-Run:
-"npm start"
-
-Start Online: https://snack.expo.io/@git/github.com/modybutt/celiapp@hadouken
-
-##########################################################################################################################
-
-						     Application Files
-
-celiapp
-    ./package.json		NPM Installation Module
-    ./app.json			Application Configuration
-    ./App.js			Application Entry
-    ./babel.config.js		Babel Configuration File (EXPO)
-    ./docdev/***		Development Documentation Files
-
-celiapp/__tests__
-    ./***-test.js		Application Test Files (JEST)	
-
-celiapp/src/constants
-    ./***.js			Global Configuration Files
-
-celiapp/src/assets
-    ./fonts/***.ttf		Font Ressources
-    ./images/***.png		Image Ressources 
-
-celiapp/src/navigation
-    ./AppNavigator.js		Navigation Logic
-    ./MainTabNavigator.js	Main Navigation
-
-celiapp/src/components
-    ./***.js			Shared Component Library
-    ./android/***.js		Native Android Components
-    ./ios/***.js		Native iOS Components
-
-celiapp/src/screens
-    ./***.js			MainTabNavigator Screens
-    ./***/***.js		Sub Screens, Dialogs, ...
-
-##########################################################################################################################
-
-						Tools & Tutorails
-
-REACT NATIVE: 		https://facebook.github.io/react-native/docs/getting-started
-EXPO: 			https://expo.io
-JEST:			https://jestjs.io
-Android Studio: 	https://developer.android.com/studio
-Icons Library: 		https://ionicons.com
-Import Organizer: 	https://github.com/tleunen/babel-plugin-module-resolver
-Tortoise GitSVN: 	https://tortoisegit.org
-EXPO-SQLite:		https://github.com/expo/expo/tree/master/packages/expo-sqlite
-
-##########################################################################################################################
-
-		      				Useful Git Commands
-
-git pull			update repo from master
-git commit -m "Commit Message"	commit local changes to repo
-git push			push local repo to master
-// ... merge & pull request?
-
-
diff --git a/app.json b/app.json
index 4c6dcd3f2..2df872818 100644
--- a/app.json
+++ b/app.json
@@ -1,19 +1,31 @@
 {
-  "expo": {
-    "name": "CeliApp",
-    "icon": "./src/assets/images/celiapp_icon_trans.png",
-    "version": "0.1.0",
-    "slug": "CeliApp",
-    "sdkVersion": "35.0.0",
-    "ios": {
-      "bundleIdentifier": "com.fhv.celiapp"
-    },
-    "android": {
-      "package": "com.fhv.celiapp"
-    },
-    "platforms": [
-      "android",
-      "ios"
-    ]
-  }
-}
+    "expo": {
+      "name": "CeliApp",
+      "icon": "./src/assets/images/web_hi_res_512.png",
+      "version": "0.2.1",
+      "slug": "CeliApp",
+      "sdkVersion": "36.0.0",
+      "orientation": "portrait",
+      "ios": {
+          "buildNumber": "109",
+          "bundleIdentifier": "ie.itcarlow.CeliApp"
+
+      },
+      "android": {
+        "versionCode": 109,
+        "package": "ie.itcarlow.CeliApp",
+        "adaptiveIcon": {
+            "backgroundColor": "#E91F64"
+        }
+      },
+      "platforms": [
+        "android",
+        "ios"
+      ],
+      "notification": {
+          "icon": "./src/assets/images/notification_icon.png",
+          "iosDisplayInForeground": true,
+          "color": "#E91F64"
+        }
+    }
+  }
\ No newline at end of file
diff --git a/babel.config.js b/babel.config.js
index 2900afe9d..716b42466 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -3,4 +3,4 @@ module.exports = function(api) {
   return {
     presets: ['babel-preset-expo'],
   };
-};
+};
\ No newline at end of file
diff --git a/debug.log b/debug.log
new file mode 100644
index 000000000..9e64141d9
--- /dev/null
+++ b/debug.log
@@ -0,0 +1,2 @@
+[1021/174058.586:ERROR:directory_reader_win.cc(43)] FindFirstFile: Das System kann den angegebenen Pfad nicht finden. (0x3)
+[1026/133833.219:ERROR:directory_reader_win.cc(43)] FindFirstFile: Das System kann den angegebenen Pfad nicht finden. (0x3)
diff --git a/devdoc/Component Libs.pdf b/devdoc/Component Libs.pdf
deleted file mode 100644
index d5737ba3d..000000000
Binary files a/devdoc/Component Libs.pdf and /dev/null differ
diff --git a/devdoc/Database.xlsx b/devdoc/Database.xlsx
deleted file mode 100644
index cf90d491e..000000000
Binary files a/devdoc/Database.xlsx and /dev/null differ
diff --git a/devdoc/Deadlines_CeliApp_FeatureComplete.xlsx b/devdoc/Deadlines_CeliApp_FeatureComplete.xlsx
deleted file mode 100644
index 4708453bf..000000000
Binary files a/devdoc/Deadlines_CeliApp_FeatureComplete.xlsx and /dev/null differ
diff --git a/devdoc/Libraries_ReadMe/ReactNativeActionButton.txt b/devdoc/Libraries_ReadMe/ReactNativeActionButton.txt
deleted file mode 100644
index bcd047495..000000000
--- a/devdoc/Libraries_ReadMe/ReactNativeActionButton.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/mastermoo/react-native-action-button
\ No newline at end of file
diff --git a/devdoc/TOPICS.txt b/devdoc/TOPICS.txt
deleted file mode 100644
index 211bbef83..000000000
--- a/devdoc/TOPICS.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-DO'S:
-
-# Database (example data skript)
-# Add Buttonv (POSITION!)
-# GlassPane + AddScreens
-# Language Bundle
-# Animation
-
-DON'T'S:
-
-# Edit/Delete Buttons
-# Dynamic Gluton (Feature Complete)
-# SymtomTracker Feature Complete
-# EvaluationScreen (list)
\ No newline at end of file
diff --git a/devdoc/architecture.png b/devdoc/architecture.png
deleted file mode 100644
index 29fa5ac93..000000000
Binary files a/devdoc/architecture.png and /dev/null differ
diff --git a/devdoc/db_design.png b/devdoc/db_design.png
deleted file mode 100644
index 71ed14b6e..000000000
Binary files a/devdoc/db_design.png and /dev/null differ
diff --git a/devdoc/dbexample.txt b/devdoc/dbexample.txt
deleted file mode 100644
index 383ee091d..000000000
--- a/devdoc/dbexample.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"_array": [{
-			"id":1,
-			"done":0,
-			"value":"test"
-		}, {
-			"id":2,
-			"done":1,
-			"value":"coool"
-		}, {
-			"id":3,
-			"done":0,
-			"value":"what?"
-		}, {
-			"id":5,
-			"done":0,
-			"value":"test2"
-		}, {
-			"id":6,
-			"done":0,
-			"value":"test4"
-		}, {
-			"id":7,
-			"done":0,
-			"value":"test3"
-		}, {
-			"id":8,
-			"done":1,
-			"value":"REMEMBER ME!"
-		}, {
-			"id":9,
-			"done":1,
-			"value":"Click me to Delete"
-		}, {
-			"id":10,
-			"done":1,
-			"value":"Click ME!"
-		}, {
-			"id":11,
-			"done":0,
-			"value":"asdef"
-		}, {
-			"id":12,
-			"done":0,
-			"value":"jaja"
-		},{"id":13,"done":0,"value":"jaja"},{"id":14,"done":1,"value":"jaja"},{"id":15,"done":0,"value":"mkay"}],"length":14}
\ No newline at end of file
diff --git a/devdoc/protocol.txt b/devdoc/protocol.txt
deleted file mode 100644
index d9dd73657..000000000
--- a/devdoc/protocol.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-MESSAGE			DIRECTION		DESCRIPTION
-
-link <addr>		Device->Server		Connect to Gear
-linked			Server->Device		UDP socket opened
-unlink			Device->Server		Disconnect from Gear
-unlinked		Server->Device		UDP socket closed
-
-msg <data>		Device->Server		Send command to Gear
-<data>			Server->Gear		
-
-
-
-msg 1_			Device->Server		Colormode
-0			Server->Gear		Red-to-Green
-1			Server->Gear		Green-to-Red
-
-msg 2_			Device->server		Daytime
-0			Server->Gear		Morning
-1			Server->Gear		Forenoon
-2			Server->Gear		Noon
-3			Server->Gear		Afternoon
-4			Server->Gear		Evening
-5			Server->Gear		Night
-
-msg 3_			Device->Server		Entry
-0			Server->Gear		Emotion
-1			Server->Gear		Meal
-2			Server->Gear		Symptom
diff --git a/devdoc/useful.txt b/devdoc/useful.txt
deleted file mode 100644
index 2265f1c25..000000000
--- a/devdoc/useful.txt
+++ /dev/null
@@ -1 +0,0 @@
-Animated Add Button: https://medium.com/@suha.baobaid/customtabnavigation-codingchallenge-1-b2db1d978801
diff --git a/dist/android-index.json b/dist/android-index.json
new file mode 100644
index 000000000..3e3d89986
--- /dev/null
+++ b/dist/android-index.json
@@ -0,0 +1 @@
+{"name":"CeliApp","icon":"./src/assets/images/celiapp_icon_trans.png","version":"0.1.0","slug":"CeliApp","sdkVersion":"35.0.0","ios":{"bundleIdentifier":"com.fhv.celiapp"},"android":{"package":"com.fhv.celiapp"},"platforms":["android","ios"],"locales":{},"iconUrl":"https://itcgames.github.io/celiapp/assets/a13e103a932d89d50c935e8ed3cf0224","assetUrlOverride":"./assets","publishedTime":"2020-02-04T10:49:19.391Z","commitTime":"2020-02-04T10:49:19.391Z","revisionId":"6DkJp2YEb1","id":"@anonymous/CeliApp","bundleUrl":"https://itcgames.github.io/celiapp/bundles/android-c25cd181da5816a4a236323ac38317b1.js","platform":"android","dependencies":["@expo/samples","@expo/vector-icons","expo","expo-camera","expo-sqlite","moment","react","react-native","react-native-action-button","react-native-calendar-picker","react-native-dialog","react-native-dynamic-search-bar","react-native-elements","react-native-gesture-handler","react-native-keyboard-aware-scroll-view","react-native-modal-datetime-picker","react-native-paper","react-native-search-bar","react-native-vector-icons","react-navigation"]}
\ No newline at end of file
diff --git a/dist/ios-index.json b/dist/ios-index.json
new file mode 100644
index 000000000..85f5c1765
--- /dev/null
+++ b/dist/ios-index.json
@@ -0,0 +1 @@
+{"name":"CeliApp","icon":"./src/assets/images/celiapp_icon_trans.png","version":"0.1.0","slug":"CeliApp","sdkVersion":"35.0.0","ios":{"bundleIdentifier":"com.fhv.celiapp"},"android":{"package":"com.fhv.celiapp"},"platforms":["android","ios"],"locales":{},"iconUrl":"https://itcgames.github.io/celiapp/assets/a13e103a932d89d50c935e8ed3cf0224","assetUrlOverride":"./assets","publishedTime":"2020-02-04T10:49:19.391Z","commitTime":"2020-02-04T10:49:19.391Z","revisionId":"6DkJp2YEb1","id":"@anonymous/CeliApp","bundleUrl":"https://itcgames.github.io/celiapp/bundles/ios-ea181550792eb0870571c37631b52c43.js","platform":"ios"}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index ef06a9e71..ffd8a2690 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3,913 +3,1052 @@
   "lockfileVersion": 1,
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
-      "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
+      "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
       "requires": {
-        "@babel/highlight": "^7.0.0"
+        "@babel/highlight": "^7.10.1"
       }
     },
-    "@babel/core": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.0.tgz",
-      "integrity": "sha512-Dzl7U0/T69DFOTwqz/FJdnOSWS57NpjNfCwMKHABr589Lg8uX1RrlBIJ7L5Dubt/xkLsx0xH5EBFzlBVes1ayA==",
+    "@babel/compat-data": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.1.tgz",
+      "integrity": "sha512-CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw==",
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.4.0",
-        "@babel/helpers": "^7.4.0",
-        "@babel/parser": "^7.4.0",
-        "@babel/template": "^7.4.0",
-        "@babel/traverse": "^7.4.0",
-        "@babel/types": "^7.4.0",
-        "convert-source-map": "^1.1.0",
+        "browserslist": "^4.12.0",
+        "invariant": "^2.2.4",
+        "semver": "^5.5.0"
+      }
+    },
+    "@babel/core": {
+      "version": "7.10.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.2.tgz",
+      "integrity": "sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==",
+      "requires": {
+        "@babel/code-frame": "^7.10.1",
+        "@babel/generator": "^7.10.2",
+        "@babel/helper-module-transforms": "^7.10.1",
+        "@babel/helpers": "^7.10.1",
+        "@babel/parser": "^7.10.2",
+        "@babel/template": "^7.10.1",
+        "@babel/traverse": "^7.10.1",
+        "@babel/types": "^7.10.2",
+        "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
-        "json5": "^2.1.0",
-        "lodash": "^4.17.11",
+        "gensync": "^1.0.0-beta.1",
+        "json5": "^2.1.2",
+        "lodash": "^4.17.13",
         "resolve": "^1.3.2",
         "semver": "^5.4.1",
         "source-map": "^0.5.0"
       }
     },
     "@babel/generator": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.0.tgz",
-      "integrity": "sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==",
+      "version": "7.10.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
+      "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
       "requires": {
-        "@babel/types": "^7.4.0",
+        "@babel/types": "^7.10.2",
         "jsesc": "^2.5.1",
-        "lodash": "^4.17.11",
-        "source-map": "^0.5.0",
-        "trim-right": "^1.0.1"
+        "lodash": "^4.17.13",
+        "source-map": "^0.5.0"
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz",
-      "integrity": "sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz",
+      "integrity": "sha512-ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw==",
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz",
-      "integrity": "sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz",
+      "integrity": "sha512-cQpVq48EkYxUU0xozpGCLla3wlkdRRqLWu1ksFMXA9CM5KQmyyRpSEsYXbao7JUkOw/tAaYKCaYyZq6HOFYtyw==",
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/helper-explode-assignable-expression": "^7.10.1",
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-builder-react-jsx": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz",
-      "integrity": "sha512-MjA9KgwCuPEkQd9ncSXvSyJ5y+j2sICHyrI0M3L+6fnS4wMSNDc1ARXsbTfbb2cXHn17VisSnU/sHFTCxVxSMw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.1.tgz",
+      "integrity": "sha512-KXzzpyWhXgzjXIlJU1ZjIXzUPdej1suE6vzqgImZ/cpAsR/CC8gUcX4EWRmDfWz/cs6HOCPMBIJ3nKoXt3BFuw==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.10.1",
+        "@babel/types": "^7.10.1"
+      }
+    },
+    "@babel/helper-builder-react-jsx-experimental": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.1.tgz",
+      "integrity": "sha512-irQJ8kpQUV3JasXPSFQ+LCCtJSc5ceZrPFVj6TElR6XCHssi3jV8ch3odIrNtjJFRZZVbrOEfJMI79TPU/h1pQ==",
       "requires": {
-        "@babel/types": "^7.3.0",
-        "esutils": "^2.0.0"
+        "@babel/helper-annotate-as-pure": "^7.10.1",
+        "@babel/helper-module-imports": "^7.10.1",
+        "@babel/types": "^7.10.1"
       }
     },
-    "@babel/helper-call-delegate": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.0.tgz",
-      "integrity": "sha512-SdqDfbVdNQCBp3WhK2mNdDvHd3BD6qbmIc43CAyjnsfCmgHMeqgDcM3BzY2lchi7HBJGJ2CVdynLWbezaE4mmQ==",
+    "@babel/helper-compilation-targets": {
+      "version": "7.10.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz",
+      "integrity": "sha512-hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA==",
       "requires": {
-        "@babel/helper-hoist-variables": "^7.4.0",
-        "@babel/traverse": "^7.4.0",
-        "@babel/types": "^7.4.0"
+        "@babel/compat-data": "^7.10.1",
+        "browserslist": "^4.12.0",
+        "invariant": "^2.2.4",
+        "levenary": "^1.1.1",
+        "semver": "^5.5.0"
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.0.tgz",
-      "integrity": "sha512-2K8NohdOT7P6Vyp23QH4w2IleP8yG3UJsbRKwA4YP6H8fErcLkFuuEEqbF2/BYBKSNci/FWJiqm6R3VhM/QHgw==",
+      "version": "7.10.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz",
+      "integrity": "sha512-5C/QhkGFh1vqcziq1vAL6SI9ymzUp8BCYjFpvYVhWP4DlATIb3u5q3iUd35mvlyGs8fO7hckkW7i0tmH+5+bvQ==",
       "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-member-expression-to-functions": "^7.0.0",
-        "@babel/helper-optimise-call-expression": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.4.0",
-        "@babel/helper-split-export-declaration": "^7.4.0"
+        "@babel/helper-function-name": "^7.10.1",
+        "@babel/helper-member-expression-to-functions": "^7.10.1",
+        "@babel/helper-optimise-call-expression": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-replace-supers": "^7.10.1",
+        "@babel/helper-split-export-declaration": "^7.10.1"
+      }
+    },
+    "@babel/helper-create-regexp-features-plugin": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz",
+      "integrity": "sha512-Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.10.1",
+        "@babel/helper-regex": "^7.10.1",
+        "regexpu-core": "^4.7.0"
       }
     },
     "@babel/helper-define-map": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.4.0.tgz",
-      "integrity": "sha512-wAhQ9HdnLIywERVcSvX40CEJwKdAa1ID4neI9NXQPDOHwwA+57DqwLiPEVy2AIyWzAk0CQ8qx4awO0VUURwLtA==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz",
+      "integrity": "sha512-+5odWpX+OnvkD0Zmq7panrMuAGQBu6aPUgvMzuMGo4R+jUOvealEj2hiqI6WhxgKrTpFoFj0+VdsuA8KDxHBDg==",
       "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/types": "^7.4.0",
-        "lodash": "^4.17.11"
+        "@babel/helper-function-name": "^7.10.1",
+        "@babel/types": "^7.10.1",
+        "lodash": "^4.17.13"
       }
     },
     "@babel/helper-explode-assignable-expression": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz",
-      "integrity": "sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz",
+      "integrity": "sha512-vcUJ3cDjLjvkKzt6rHrl767FeE7pMEYfPanq5L16GRtrXIoznc0HykNW2aEYkcnP76P0isoqJ34dDMFZwzEpJg==",
       "requires": {
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/traverse": "^7.10.1",
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
-      "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
+      "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
       "requires": {
-        "@babel/helper-get-function-arity": "^7.0.0",
-        "@babel/template": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/helper-get-function-arity": "^7.10.1",
+        "@babel/template": "^7.10.1",
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-get-function-arity": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
-      "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
+      "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.0.tgz",
-      "integrity": "sha512-/NErCuoe/et17IlAQFKWM24qtyYYie7sFIrW/tIQXpck6vAu2hhtYYsKLBWQV+BQZMbcIYPU/QMYuTufrY4aQw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz",
+      "integrity": "sha512-vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg==",
       "requires": {
-        "@babel/types": "^7.4.0"
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz",
-      "integrity": "sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz",
+      "integrity": "sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==",
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz",
-      "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz",
+      "integrity": "sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==",
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz",
-      "integrity": "sha512-YRD7I6Wsv+IHuTPkAmAS4HhY0dkPobgLftHp0cRGZSdrRvmZY8rFvae/GVu3bD00qscuvK3WPHB3YdNpBXUqrA==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz",
+      "integrity": "sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==",
       "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/helper-simple-access": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.0.0",
-        "@babel/template": "^7.2.2",
-        "@babel/types": "^7.2.2",
-        "lodash": "^4.17.10"
+        "@babel/helper-module-imports": "^7.10.1",
+        "@babel/helper-replace-supers": "^7.10.1",
+        "@babel/helper-simple-access": "^7.10.1",
+        "@babel/helper-split-export-declaration": "^7.10.1",
+        "@babel/template": "^7.10.1",
+        "@babel/types": "^7.10.1",
+        "lodash": "^4.17.13"
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz",
-      "integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz",
+      "integrity": "sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==",
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
-      "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA=="
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz",
+      "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA=="
     },
     "@babel/helper-regex": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.0.0.tgz",
-      "integrity": "sha512-TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.1.tgz",
+      "integrity": "sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==",
       "requires": {
-        "lodash": "^4.17.10"
+        "lodash": "^4.17.13"
       }
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz",
-      "integrity": "sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz",
+      "integrity": "sha512-RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-wrap-function": "^7.1.0",
-        "@babel/template": "^7.1.0",
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/helper-annotate-as-pure": "^7.10.1",
+        "@babel/helper-wrap-function": "^7.10.1",
+        "@babel/template": "^7.10.1",
+        "@babel/traverse": "^7.10.1",
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.4.0.tgz",
-      "integrity": "sha512-PVwCVnWWAgnal+kJ+ZSAphzyl58XrFeSKSAJRiqg5QToTsjL+Xu1f9+RJ+d+Q0aPhPfBGaYfkox66k86thxNSg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz",
+      "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==",
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.0.0",
-        "@babel/helper-optimise-call-expression": "^7.0.0",
-        "@babel/traverse": "^7.4.0",
-        "@babel/types": "^7.4.0"
+        "@babel/helper-member-expression-to-functions": "^7.10.1",
+        "@babel/helper-optimise-call-expression": "^7.10.1",
+        "@babel/traverse": "^7.10.1",
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz",
-      "integrity": "sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz",
+      "integrity": "sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==",
       "requires": {
-        "@babel/template": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/template": "^7.10.1",
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz",
-      "integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
+      "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
       "requires": {
-        "@babel/types": "^7.4.0"
+        "@babel/types": "^7.10.1"
       }
     },
+    "@babel/helper-validator-identifier": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
+      "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw=="
+    },
     "@babel/helper-wrap-function": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz",
-      "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz",
+      "integrity": "sha512-C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ==",
       "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/template": "^7.1.0",
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.2.0"
+        "@babel/helper-function-name": "^7.10.1",
+        "@babel/template": "^7.10.1",
+        "@babel/traverse": "^7.10.1",
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helpers": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.0.tgz",
-      "integrity": "sha512-2Lfcn74A2WSFUbYJ76ilYE1GnegCKUHTfXxp25EL2zPZHjV7OcDncqNjl295mUH0VnB65mNriXW4J5ROvxsgGg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz",
+      "integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==",
       "requires": {
-        "@babel/template": "^7.4.0",
-        "@babel/traverse": "^7.4.0",
-        "@babel/types": "^7.4.0"
+        "@babel/template": "^7.10.1",
+        "@babel/traverse": "^7.10.1",
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/highlight": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
-      "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
+      "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
       "requires": {
+        "@babel/helper-validator-identifier": "^7.10.1",
         "chalk": "^2.0.0",
-        "esutils": "^2.0.2",
         "js-tokens": "^4.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.0.tgz",
-      "integrity": "sha512-ZmMhJfU/+SXXvy9ALjDZopa3T3EixQtQai89JRC48eM9OUwrxJjYjuM/0wmdl2AekytlzMVhPY8cYdLb13kpKQ=="
+      "version": "7.10.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
+      "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ=="
     },
     "@babel/plugin-external-helpers": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-external-helpers/-/plugin-external-helpers-7.2.0.tgz",
-      "integrity": "sha512-QFmtcCShFkyAsNtdCM3lJPmRe1iB+vPZymlB4LnDIKEBj2yKQLQKtoxXxJ8ePT5fwMl4QGg303p4mB0UsSI2/g==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-external-helpers/-/plugin-external-helpers-7.12.1.tgz",
+      "integrity": "sha512-5VBqan0daXhDSRjrq2miABuELRwWJWFdM42Jvs/CDuhp+Es+fW+ISA5l+co8d+9oN3WLz/N3VvzyeseL3AvjxA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "dependencies": {
+        "@babel/helper-plugin-utils": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
+          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="
+        }
       }
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz",
-      "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz",
+      "integrity": "sha512-vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-remap-async-to-generator": "^7.1.0",
-        "@babel/plugin-syntax-async-generators": "^7.2.0"
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-remap-async-to-generator": "^7.10.1",
+        "@babel/plugin-syntax-async-generators": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-class-properties": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.0.tgz",
-      "integrity": "sha512-t2ECPNOXsIeK1JxJNKmgbzQtoG27KIlVE61vTqX0DKR9E9sZlVVxWUtEW9D5FlZ8b8j7SBNCHY47GgPKCKlpPg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz",
+      "integrity": "sha512-sqdGWgoXlnOdgMXU+9MbhzwFRgxVLeiGBqTrnuS7LC2IBU31wSsESbTUreT2O418obpfPdGUR2GbEufZF1bpqw==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.4.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-create-class-features-plugin": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-proposal-decorators": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.0.tgz",
-      "integrity": "sha512-d08TLmXeK/XbgCo7ZeZ+JaeZDtDai/2ctapTRsWWkkmy7G/cqz8DQN/HlWG7RR4YmfXxmExsbU3SuCjlM7AtUg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.1.tgz",
+      "integrity": "sha512-xBfteh352MTke2U1NpclzMDmAmCdQ2fBZjhZQQfGTjXw6qcRYMkt528sA1U8o0ThDCSeuETXIj5bOGdxN+5gkw==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.4.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-decorators": "^7.2.0"
+        "@babel/helper-create-class-features-plugin": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-decorators": "^7.10.1"
+      }
+    },
+    "@babel/plugin-proposal-dynamic-import": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz",
+      "integrity": "sha512-Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-export-default-from": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.2.0.tgz",
-      "integrity": "sha512-NVfNe7F6nsasG1FnvcFxh2FN0l04ZNe75qTOAVOILWPam0tw9a63RtT/Dab8dPjedZa4fTQaQ83yMMywF9OSug==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.10.1.tgz",
+      "integrity": "sha512-Xfc1CfHapIkwZ/+AI+j4Ha3g233ol0EEdy6SmnUuQQiZX78SfQXHd8tmntc5zqCkwPnIHoiZa6l6p0OAvxYXHw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-export-default-from": "^7.2.0"
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-export-default-from": "^7.10.1"
       }
     },
     "@babel/plugin-proposal-json-strings": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",
-      "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz",
+      "integrity": "sha512-m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-json-strings": "^7.2.0"
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-json-strings": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.2.0.tgz",
-      "integrity": "sha512-QXj/YjFuFJd68oDvoc1e8aqLr2wz7Kofzvp6Ekd/o7MWZl+nZ0/cpStxND+hlZ7DpRWAp7OmuyT2areZ2V3YUA==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz",
+      "integrity": "sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.2.0"
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-numeric-separator": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz",
+      "integrity": "sha512-jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.1"
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.0.tgz",
-      "integrity": "sha512-uTNi8pPYyUH2eWHyYWWSYJKwKg34hhgl4/dbejEjL+64OhbHjTX7wEVWMQl82tEmdDsGeu77+s8HHLS627h6OQ==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz",
+      "integrity": "sha512-Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.2.0"
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+        "@babel/plugin-transform-parameters": "^7.10.1"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz",
-      "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz",
+      "integrity": "sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0"
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.2.0.tgz",
-      "integrity": "sha512-ea3Q6edZC/55wEBVZAEz42v528VulyO0eir+7uky/sT4XRcdkWJcFi1aPtitTlwUzGnECWJNExWww1SStt+yWw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz",
+      "integrity": "sha512-dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.2.0"
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-private-methods": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.1.tgz",
+      "integrity": "sha512-RZecFFJjDiQ2z6maFprLgrdnm0OzoC23Mx89xf1CcEsxmHuzuXOdniEuI+S3v7vjQG4F5sa6YtUp+19sZuSxHg==",
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.0.tgz",
-      "integrity": "sha512-h/KjEZ3nK9wv1P1FSNb9G079jXrNYR0Ko+7XkOx85+gM24iZbPn0rh4vCftk+5QKY7y1uByFataBTmX7irEF1w==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz",
+      "integrity": "sha512-JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.0.0",
-        "regexpu-core": "^4.5.4"
+        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-syntax-async-generators": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz",
-      "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==",
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
     "@babel/plugin-syntax-class-properties": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.2.0.tgz",
-      "integrity": "sha512-UxYaGXYQ7rrKJS/PxIKRkv3exi05oH7rokBAsmCSsCxz1sVPZ7Fu6FzKoGgUvmY+0YgSkYHgUoCh5R5bCNBQlw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz",
+      "integrity": "sha512-Gf2Yx/iRs1JREDtVZ56OrjjgFHCaldpTnuy9BHla10qyVT3YkIIGEtoDWhyop0ksu1GvNjHIoYRBqm3zoR1jyQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-syntax-decorators": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz",
-      "integrity": "sha512-38QdqVoXdHUQfTpZo3rQwqQdWtCn5tMv4uV6r2RMfTqNBuv4ZBhz79SfaQWKTVmxHjeFv/DnXVC/+agHCklYWA==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.1.tgz",
+      "integrity": "sha512-a9OAbQhKOwSle1Vr0NJu/ISg1sPfdEkfRKWpgPuzhnWWzForou2gIeUIIwjAMHRekhhpJ7eulZlYs0H14Cbi+g==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-syntax-dynamic-import": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz",
-      "integrity": "sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
     "@babel/plugin-syntax-export-default-from": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.2.0.tgz",
-      "integrity": "sha512-c7nqUnNST97BWPtoe+Ssi+fJukc9P9/JMZ71IOMNQWza2E+Psrd46N6AEvtw6pqK+gt7ChjXyrw4SPDO79f3Lw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.10.1.tgz",
+      "integrity": "sha512-+rcL4S/mN1Ss4zhSCbxzv1Wsf12eauvgTjWi0krXEeX1zd6qSxYnJoniE5Ssr5w2WPt61oUCJyXIFQIqO/29zw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-syntax-flow": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz",
-      "integrity": "sha512-r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.1.tgz",
+      "integrity": "sha512-b3pWVncLBYoPP60UOTc7NMlbtsHQ6ITim78KQejNHK6WJ2mzV5kCcg4mIWpasAfJEgwVTibwo2e+FU7UEIKQUg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-syntax-json-strings": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz",
-      "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
     "@babel/plugin-syntax-jsx": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz",
-      "integrity": "sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.1.tgz",
+      "integrity": "sha512-+OxyOArpVFXQeXKLO9o+r2I4dIoVoy6+Uu0vKELrlweDM3QJADZj+Z+5ERansZqIZBcLj42vHnDI8Rz9BnRIuQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.2.0.tgz",
-      "integrity": "sha512-lRCEaKE+LTxDQtgbYajI04ddt6WW0WJq57xqkAZ+s11h4YgfRHhVA/Y2VhfPzzFD4qeLHWg32DMp9HooY4Kqlg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz",
+      "integrity": "sha512-uTd0OsHrpe3tH5gRPTxG8Voh99/WCU78vIm5NMRYPAqC8lR4vajt6KkCAknCHrx24vkPdd/05yfdGSB4EIY2mg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz",
-      "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
     "@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz",
-      "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
     "@babel/plugin-syntax-optional-chaining": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.2.0.tgz",
-      "integrity": "sha512-HtGCtvp5Uq/jH/WNUPkK6b7rufnCPLLlDAFN7cmACoIjaOOiXxUt3SswU5loHqrhtqTsa/WoLQ1OQ1AGuZqaWA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-top-level-await": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz",
+      "integrity": "sha512-hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-syntax-typescript": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.3.3.tgz",
-      "integrity": "sha512-dGwbSMA1YhVS8+31CnPR7LB4pcbrzcV99wQzby4uAfrkZPYZlQ7ImwdpzLqi6Z6IL02b8IAL379CaMwo0x5Lag==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.1.tgz",
+      "integrity": "sha512-X/d8glkrAtra7CaQGMiGs/OGa6XgUzqPcBXCIGFCpCqnfGlT0Wfbzo/B89xHhnInTaItPK8LALblVXcUOEh95Q==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz",
-      "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz",
+      "integrity": "sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.0.tgz",
-      "integrity": "sha512-EeaFdCeUULM+GPFEsf7pFcNSxM7hYjoj5fiYbyuiXobW4JhFnjAv9OWzNwHyHcKoPNpAfeRDuW6VyaXEDUBa7g==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz",
+      "integrity": "sha512-XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg==",
       "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-remap-async-to-generator": "^7.1.0"
+        "@babel/helper-module-imports": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-remap-async-to-generator": "^7.10.1"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz",
-      "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz",
+      "integrity": "sha512-B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.0.tgz",
-      "integrity": "sha512-AWyt3k+fBXQqt2qb9r97tn3iBwFpiv9xdAiG+Gr2HpAZpuayvbL55yWrsV3MyHvXk/4vmSiedhDRl1YI2Iy5nQ==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz",
+      "integrity": "sha512-8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "lodash": "^4.17.11"
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "lodash": "^4.17.13"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.0.tgz",
-      "integrity": "sha512-XGg1Mhbw4LDmrO9rSTNe+uI79tQPdGs0YASlxgweYRLZqo/EQktjaOV4tchL/UZbM0F+/94uOipmdNGoaGOEYg==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-define-map": "^7.4.0",
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-optimise-call-expression": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.4.0",
-        "@babel/helper-split-export-declaration": "^7.4.0",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz",
+      "integrity": "sha512-P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.10.1",
+        "@babel/helper-define-map": "^7.10.1",
+        "@babel/helper-function-name": "^7.10.1",
+        "@babel/helper-optimise-call-expression": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-replace-supers": "^7.10.1",
+        "@babel/helper-split-export-declaration": "^7.10.1",
         "globals": "^11.1.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz",
-      "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz",
+      "integrity": "sha512-mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.0.tgz",
-      "integrity": "sha512-HySkoatyYTY3ZwLI8GGvkRWCFrjAGXUHur5sMecmCIdIharnlcWWivOqDJI76vvmVZfzwb6G08NREsrY96RhGQ==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz",
+      "integrity": "sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.2.0.tgz",
-      "integrity": "sha512-sKxnyHfizweTgKZf7XsXu/CNupKhzijptfTM+bozonIuyVrLWVUvYjE2bhuSBML8VQeMxq4Mm63Q9qvcvUcciQ==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz",
+      "integrity": "sha512-19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.0.0",
-        "regexpu-core": "^4.1.3"
+        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz",
-      "integrity": "sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz",
+      "integrity": "sha512-wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz",
-      "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz",
+      "integrity": "sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA==",
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-flow-strip-types": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.0.tgz",
-      "integrity": "sha512-C4ZVNejHnfB22vI2TYN4RUp2oCmq6cSEAg4RygSvYZUECRqUu9O4PMEMNJ4wsemaRGg27BbgYctG4BZh+AgIHw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.10.1.tgz",
+      "integrity": "sha512-i4o0YwiJBIsIx7/liVCZ3Q2WkWr1/Yu39PksBOnh/khW2SwIFsGa5Ze+MSon5KbDfrEHP9NeyefAgvUSXzaEkw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-flow": "^7.2.0"
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-flow": "^7.10.1"
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.0.tgz",
-      "integrity": "sha512-vWdfCEYLlYSxbsKj5lGtzA49K3KANtb8qCPQ1em07txJzsBwY+cKJzBHizj5fl3CCx7vt+WPdgDLTHmydkbQSQ==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz",
+      "integrity": "sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.2.0.tgz",
-      "integrity": "sha512-kWgksow9lHdvBC2Z4mxTsvc7YdY7w/V6B2vy9cTIPtLEE9NhwoWivaxdNM/S37elu5bqlLP/qOY906LukO9lkQ==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz",
+      "integrity": "sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw==",
       "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-function-name": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz",
-      "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz",
+      "integrity": "sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz",
-      "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz",
+      "integrity": "sha512-UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz",
-      "integrity": "sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz",
+      "integrity": "sha512-31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-module-transforms": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.0.tgz",
-      "integrity": "sha512-iWKAooAkipG7g1IY0eah7SumzfnIT3WNhT4uYB2kIsvHnNSB6MDYVa5qyICSwaTBDBY2c4SnJ3JtEa6ltJd6Jw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz",
+      "integrity": "sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-simple-access": "^7.1.0"
+        "@babel/helper-module-transforms": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-simple-access": "^7.10.1",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.0.tgz",
-      "integrity": "sha512-gjPdHmqiNhVoBqus5qK60mWPp1CmYWp/tkh11mvb0rrys01HycEGD7NvvSoKXlWEfSM9TcL36CpsK8ElsADptQ==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz",
+      "integrity": "sha512-ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA==",
       "requires": {
-        "@babel/helper-hoist-variables": "^7.4.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-hoist-variables": "^7.10.1",
+        "@babel/helper-module-transforms": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz",
-      "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz",
+      "integrity": "sha512-EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-module-transforms": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.3.0.tgz",
-      "integrity": "sha512-NxIoNVhk9ZxS+9lSoAQ/LM0V2UEvARLttEHUrRDGKFaAxOYQcrkN/nLRE+BbbicCAvZPl7wMP0X60HsHE5DtQw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz",
+      "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==",
       "requires": {
-        "regexp-tree": "^0.1.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.8.3"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.0.tgz",
-      "integrity": "sha512-6ZKNgMQmQmrEX/ncuCwnnw1yVGoaOW5KpxNhoWI7pCQdA0uZ0HqHGqenCUIENAnxRjy2WwNQ30gfGdIgqJXXqw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz",
+      "integrity": "sha512-MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-object-assign": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.2.0.tgz",
-      "integrity": "sha512-nmE55cZBPFgUktbF2OuoZgPRadfxosLOpSgzEPYotKSls9J4pEPcembi8r78RU37Rph6UApCpNmsQA4QMWK9Ng==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.10.1.tgz",
+      "integrity": "sha512-poBEVwzcTjv6p92ZcnWBUftzyXFCy/Zg/eCQsayu5/ot2+qwnasNvCCKPwdgprgDRzbHVUhh/fzI9rCoFOHLbg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.2.0.tgz",
-      "integrity": "sha512-VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz",
+      "integrity": "sha512-WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.1.0"
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-replace-supers": "^7.10.1"
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.0.tgz",
-      "integrity": "sha512-Xqv6d1X+doyiuCGDoVJFtlZx0onAX0tnc3dY8w71pv/O0dODAbusVv2Ale3cGOwfiyi895ivOBhYa9DhAM8dUA==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz",
+      "integrity": "sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==",
       "requires": {
-        "@babel/helper-call-delegate": "^7.4.0",
-        "@babel/helper-get-function-arity": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-get-function-arity": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz",
-      "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz",
+      "integrity": "sha512-Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-react-display-name": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz",
-      "integrity": "sha512-Htf/tPa5haZvRMiNSQSFifK12gtr/8vwfr+A9y69uF0QcU77AVu4K7MiHEkTxF7lQoHOL0F9ErqgfNEAKgXj7A==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.1.tgz",
+      "integrity": "sha512-rBjKcVwjk26H3VX8pavMxGf33LNlbocMHdSeldIEswtQ/hrjyTG8fKKILW1cSkODyRovckN/uZlGb2+sAV9JUQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-react-jsx": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz",
-      "integrity": "sha512-a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.1.tgz",
+      "integrity": "sha512-MBVworWiSRBap3Vs39eHt+6pJuLUAaK4oxGc8g+wY+vuSJvLiEQjW1LSTqKb8OUPtDvHCkdPhk7d6sjC19xyFw==",
       "requires": {
-        "@babel/helper-builder-react-jsx": "^7.3.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-jsx": "^7.2.0"
+        "@babel/helper-builder-react-jsx": "^7.10.1",
+        "@babel/helper-builder-react-jsx-experimental": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-jsx": "^7.10.1"
       }
     },
     "@babel/plugin-transform-react-jsx-source": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.2.0.tgz",
-      "integrity": "sha512-A32OkKTp4i5U6aE88GwwcuV4HAprUgHcTq0sSafLxjr6AW0QahrCRCjxogkbbcdtpbXkuTOlgpjophCxb6sh5g==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.1.tgz",
+      "integrity": "sha512-neAbaKkoiL+LXYbGDvh6PjPG+YeA67OsZlE78u50xbWh2L1/C81uHiNP5d1fw+uqUIoiNdCC8ZB+G4Zh3hShJA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-jsx": "^7.2.0"
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-jsx": "^7.10.1"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.0.tgz",
-      "integrity": "sha512-SZ+CgL4F0wm4npojPU6swo/cK4FcbLgxLd4cWpHaNXY/NJ2dpahODCqBbAwb2rDmVszVb3SSjnk9/vik3AYdBw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz",
+      "integrity": "sha512-B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw==",
       "requires": {
-        "regenerator-transform": "^0.13.4"
+        "regenerator-transform": "^0.14.2"
+      }
+    },
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz",
+      "integrity": "sha512-qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-runtime": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.4.0.tgz",
-      "integrity": "sha512-1uv2h9wnRj98XX3g0l4q+O3jFM6HfayKup7aIu4pnnlzGz0H+cYckGBC74FZIWJXJSXAmeJ9Yu5Gg2RQpS4hWg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.1.tgz",
+      "integrity": "sha512-4w2tcglDVEwXJ5qxsY++DgWQdNJcCCsPxfT34wCUwIf2E7dI7pMpH8JczkMBbgBTNzBX62SZlNJ9H+De6Zebaw==",
       "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-module-imports": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1",
         "resolve": "^1.8.1",
         "semver": "^5.5.1"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz",
-      "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz",
+      "integrity": "sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz",
-      "integrity": "sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz",
+      "integrity": "sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz",
-      "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz",
+      "integrity": "sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-regex": "^7.10.1"
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.2.0.tgz",
-      "integrity": "sha512-FkPix00J9A/XWXv4VoKJBMeSkyY9x/TqIh76wzcdfl57RJJcf8CehQ08uwfhCDNtRQYtHQKBTwKZDEyjE13Lwg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz",
+      "integrity": "sha512-t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-annotate-as-pure": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz",
-      "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz",
+      "integrity": "sha512-qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-typescript": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.4.0.tgz",
-      "integrity": "sha512-U7/+zKnRZg04ggM/Bm+xmu2B/PrwyDQTT/V89FXWYWNMxBDwSx56u6jtk9SEbfLFbZaEI72L+5LPvQjeZgFCrQ==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.1.tgz",
+      "integrity": "sha512-v+QWKlmCnsaimLeqq9vyCsVRMViZG1k2SZTlcZvB+TqyH570Zsij8nvVUZzOASCRiQFUxkLrn9Wg/kH0zgy5OQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-typescript": "^7.2.0"
+        "@babel/helper-create-class-features-plugin": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-typescript": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-unicode-escapes": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.1.tgz",
+      "integrity": "sha512-zZ0Poh/yy1d4jeDWpx/mNwbKJVwUYJX73q+gyh4bwtG0/iUlzdEu0sLMda8yuDFS6LBQlT/ST1SJAR6zYwXWgw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz",
-      "integrity": "sha512-m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz",
+      "integrity": "sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.0.0",
-        "regexpu-core": "^4.1.3"
+        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/preset-env": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.1.tgz",
-      "integrity": "sha512-uC2DeVb6ljdjBGhJCyHxNZfSJEVgPdUm2R5cX85GCl1Qreo5sMM5g85ntqtzRF7XRYGgnRmV5we9cdlvo1wJvg==",
+      "version": "7.10.2",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.2.tgz",
+      "integrity": "sha512-MjqhX0RZaEgK/KueRzh+3yPSk30oqDKJ5HP5tqTSB1e2gzGS3PLy7K0BIpnp78+0anFuSwOeuCf1zZO7RzRvEA==",
+      "requires": {
+        "@babel/compat-data": "^7.10.1",
+        "@babel/helper-compilation-targets": "^7.10.2",
+        "@babel/helper-module-imports": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-proposal-async-generator-functions": "^7.10.1",
+        "@babel/plugin-proposal-class-properties": "^7.10.1",
+        "@babel/plugin-proposal-dynamic-import": "^7.10.1",
+        "@babel/plugin-proposal-json-strings": "^7.10.1",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.1",
+        "@babel/plugin-proposal-numeric-separator": "^7.10.1",
+        "@babel/plugin-proposal-object-rest-spread": "^7.10.1",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.10.1",
+        "@babel/plugin-proposal-optional-chaining": "^7.10.1",
+        "@babel/plugin-proposal-private-methods": "^7.10.1",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.10.1",
+        "@babel/plugin-syntax-async-generators": "^7.8.0",
+        "@babel/plugin-syntax-class-properties": "^7.10.1",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.0",
+        "@babel/plugin-syntax-json-strings": "^7.8.0",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.1",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.0",
+        "@babel/plugin-syntax-top-level-await": "^7.10.1",
+        "@babel/plugin-transform-arrow-functions": "^7.10.1",
+        "@babel/plugin-transform-async-to-generator": "^7.10.1",
+        "@babel/plugin-transform-block-scoped-functions": "^7.10.1",
+        "@babel/plugin-transform-block-scoping": "^7.10.1",
+        "@babel/plugin-transform-classes": "^7.10.1",
+        "@babel/plugin-transform-computed-properties": "^7.10.1",
+        "@babel/plugin-transform-destructuring": "^7.10.1",
+        "@babel/plugin-transform-dotall-regex": "^7.10.1",
+        "@babel/plugin-transform-duplicate-keys": "^7.10.1",
+        "@babel/plugin-transform-exponentiation-operator": "^7.10.1",
+        "@babel/plugin-transform-for-of": "^7.10.1",
+        "@babel/plugin-transform-function-name": "^7.10.1",
+        "@babel/plugin-transform-literals": "^7.10.1",
+        "@babel/plugin-transform-member-expression-literals": "^7.10.1",
+        "@babel/plugin-transform-modules-amd": "^7.10.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.10.1",
+        "@babel/plugin-transform-modules-systemjs": "^7.10.1",
+        "@babel/plugin-transform-modules-umd": "^7.10.1",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
+        "@babel/plugin-transform-new-target": "^7.10.1",
+        "@babel/plugin-transform-object-super": "^7.10.1",
+        "@babel/plugin-transform-parameters": "^7.10.1",
+        "@babel/plugin-transform-property-literals": "^7.10.1",
+        "@babel/plugin-transform-regenerator": "^7.10.1",
+        "@babel/plugin-transform-reserved-words": "^7.10.1",
+        "@babel/plugin-transform-shorthand-properties": "^7.10.1",
+        "@babel/plugin-transform-spread": "^7.10.1",
+        "@babel/plugin-transform-sticky-regex": "^7.10.1",
+        "@babel/plugin-transform-template-literals": "^7.10.1",
+        "@babel/plugin-transform-typeof-symbol": "^7.10.1",
+        "@babel/plugin-transform-unicode-escapes": "^7.10.1",
+        "@babel/plugin-transform-unicode-regex": "^7.10.1",
+        "@babel/preset-modules": "^0.1.3",
+        "@babel/types": "^7.10.2",
+        "browserslist": "^4.12.0",
+        "core-js-compat": "^3.6.2",
+        "invariant": "^2.2.2",
+        "levenary": "^1.1.1",
+        "semver": "^5.5.0"
+      }
+    },
+    "@babel/preset-modules": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz",
+      "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==",
       "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-async-generator-functions": "^7.2.0",
-        "@babel/plugin-proposal-json-strings": "^7.2.0",
-        "@babel/plugin-proposal-object-rest-spread": "^7.4.0",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.0",
-        "@babel/plugin-syntax-async-generators": "^7.2.0",
-        "@babel/plugin-syntax-json-strings": "^7.2.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0",
-        "@babel/plugin-transform-arrow-functions": "^7.2.0",
-        "@babel/plugin-transform-async-to-generator": "^7.4.0",
-        "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
-        "@babel/plugin-transform-block-scoping": "^7.4.0",
-        "@babel/plugin-transform-classes": "^7.4.0",
-        "@babel/plugin-transform-computed-properties": "^7.2.0",
-        "@babel/plugin-transform-destructuring": "^7.4.0",
-        "@babel/plugin-transform-dotall-regex": "^7.2.0",
-        "@babel/plugin-transform-duplicate-keys": "^7.2.0",
-        "@babel/plugin-transform-exponentiation-operator": "^7.2.0",
-        "@babel/plugin-transform-for-of": "^7.4.0",
-        "@babel/plugin-transform-function-name": "^7.2.0",
-        "@babel/plugin-transform-literals": "^7.2.0",
-        "@babel/plugin-transform-modules-amd": "^7.2.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.4.0",
-        "@babel/plugin-transform-modules-systemjs": "^7.4.0",
-        "@babel/plugin-transform-modules-umd": "^7.2.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.3.0",
-        "@babel/plugin-transform-new-target": "^7.4.0",
-        "@babel/plugin-transform-object-super": "^7.2.0",
-        "@babel/plugin-transform-parameters": "^7.4.0",
-        "@babel/plugin-transform-regenerator": "^7.4.0",
-        "@babel/plugin-transform-shorthand-properties": "^7.2.0",
-        "@babel/plugin-transform-spread": "^7.2.0",
-        "@babel/plugin-transform-sticky-regex": "^7.2.0",
-        "@babel/plugin-transform-template-literals": "^7.2.0",
-        "@babel/plugin-transform-typeof-symbol": "^7.2.0",
-        "@babel/plugin-transform-unicode-regex": "^7.2.0",
-        "@babel/types": "^7.4.0",
-        "browserslist": "^4.4.2",
-        "core-js-compat": "^3.0.0",
-        "invariant": "^2.2.2",
-        "js-levenshtein": "^1.1.3",
-        "semver": "^5.3.0"
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
       }
     },
     "@babel/register": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.6.2.tgz",
-      "integrity": "sha512-xgZk2LRZvt6i2SAUWxc7ellk4+OYRgS3Zpsnr13nMS1Qo25w21Uu8o6vTOAqNaxiqrnv30KTYzh9YWY2k21CeQ==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.12.1.tgz",
+      "integrity": "sha512-XWcmseMIncOjoydKZnWvWi0/5CUCD+ZYKhRwgYlWOrA8fGZ/FjuLRpqtIhLOVD/fvR1b9DQHtZPn68VvhpYf+Q==",
       "requires": {
         "find-cache-dir": "^2.0.0",
-        "lodash": "^4.17.13",
-        "mkdirp": "^0.5.1",
+        "lodash": "^4.17.19",
+        "make-dir": "^2.1.0",
         "pirates": "^4.0.0",
-        "source-map-support": "^0.5.9"
+        "source-map-support": "^0.5.16"
       },
       "dependencies": {
         "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+          "version": "4.17.20",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
         }
       }
     },
     "@babel/runtime": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.3.tgz",
-      "integrity": "sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA==",
+      "version": "7.10.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz",
+      "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==",
       "requires": {
-        "regenerator-runtime": "^0.13.2"
+        "regenerator-runtime": "^0.13.4"
       }
     },
     "@babel/template": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.0.tgz",
-      "integrity": "sha512-SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
+      "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.4.0",
-        "@babel/types": "^7.4.0"
+        "@babel/code-frame": "^7.10.1",
+        "@babel/parser": "^7.10.1",
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/traverse": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.0.tgz",
-      "integrity": "sha512-/DtIHKfyg2bBKnIN+BItaIlEg5pjAnzHOIQe5w+rHAw/rg9g0V7T4rqPX8BJPfW11kt3koyjAnTNwCzb28Y1PA==",
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.4.0",
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.4.0",
-        "@babel/parser": "^7.4.0",
-        "@babel/types": "^7.4.0",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
+      "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
+      "requires": {
+        "@babel/code-frame": "^7.10.1",
+        "@babel/generator": "^7.10.1",
+        "@babel/helper-function-name": "^7.10.1",
+        "@babel/helper-split-export-declaration": "^7.10.1",
+        "@babel/parser": "^7.10.1",
+        "@babel/types": "^7.10.1",
         "debug": "^4.1.0",
         "globals": "^11.1.0",
-        "lodash": "^4.17.11"
+        "lodash": "^4.17.13"
       }
     },
     "@babel/types": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz",
-      "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==",
+      "version": "7.10.2",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
+      "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
       "requires": {
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.11",
+        "@babel/helper-validator-identifier": "^7.10.1",
+        "lodash": "^4.17.13",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -923,8 +1062,52 @@
         "flow-copy-source": "^1.3.0",
         "hoist-non-react-statics": "^2.5.0",
         "prop-types": "^15.6.0"
+      },
+      "dependencies": {
+        "deepmerge": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz",
+          "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
+        },
+        "hoist-non-react-statics": {
+          "version": "2.5.5",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
+          "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
+        }
+      }
+    },
+    "@cnakazawa/watch": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
+      "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
+      "requires": {
+        "exec-sh": "^0.3.2",
+        "minimist": "^1.2.0"
+      }
+    },
+    "@emotion/is-prop-valid": {
+      "version": "0.8.8",
+      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
+      "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
+      "requires": {
+        "@emotion/memoize": "0.7.4"
       }
     },
+    "@emotion/memoize": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
+      "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
+    },
+    "@emotion/stylis": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
+      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="
+    },
+    "@emotion/unitless": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
+      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
+    },
     "@expo/samples": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/@expo/samples/-/samples-2.1.1.tgz",
@@ -934,9 +1117,9 @@
       }
     },
     "@expo/vector-icons": {
-      "version": "10.0.6",
-      "resolved": "https://registry.npmjs.org/@expo/vector-icons/-/vector-icons-10.0.6.tgz",
-      "integrity": "sha512-qNlKPNdf073LpeEpyClxAh0D3mmIK4TGAQzeKR0HVwf14RIEe17+mLW5Z6Ka5Ho/lUtKMRPDHumSllFyKvpeGg==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/@expo/vector-icons/-/vector-icons-10.2.0.tgz",
+      "integrity": "sha512-dYe0SW/xbzWRtWG7i1pc3QPMGMbdReVgP02XlwMkS4srAAjF0cZQVa3ZgZ6qzxI+OzKudpDXZRmENNth/b263g==",
       "requires": {
         "lodash": "^4.17.4"
       }
@@ -953,11 +1136,44 @@
         "tiny-queue": "^0.2.1"
       }
     },
+    "@hapi/address": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
+      "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="
+    },
+    "@hapi/bourne": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz",
+      "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="
+    },
+    "@hapi/hoek": {
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz",
+      "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="
+    },
+    "@hapi/joi": {
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz",
+      "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==",
+      "requires": {
+        "@hapi/address": "2.x.x",
+        "@hapi/bourne": "1.x.x",
+        "@hapi/hoek": "8.x.x",
+        "@hapi/topo": "3.x.x"
+      }
+    },
+    "@hapi/topo": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz",
+      "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==",
+      "requires": {
+        "@hapi/hoek": "^8.3.0"
+      }
+    },
     "@jest/console": {
       "version": "24.9.0",
       "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
       "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
-      "dev": true,
       "requires": {
         "@jest/source-map": "^24.9.0",
         "chalk": "^2.0.1",
@@ -1000,12 +1216,28 @@
         "strip-ansi": "^5.0.0"
       },
       "dependencies": {
+        "@cnakazawa/watch": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
+          "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
+          "dev": true,
+          "requires": {
+            "exec-sh": "^0.3.2",
+            "minimist": "^1.2.0"
+          }
+        },
         "ansi-regex": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -1041,6 +1273,15 @@
             }
           }
         },
+        "capture-exit": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
+          "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
+          "dev": true,
+          "requires": {
+            "rsvp": "^4.8.4"
+          }
+        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -1050,6 +1291,12 @@
             "ms": "2.0.0"
           }
         },
+        "exec-sh": {
+          "version": "0.3.4",
+          "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
+          "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+          "dev": true
+        },
         "expand-brackets": {
           "version": "2.1.4",
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -1276,6 +1523,28 @@
             "walker": "^1.0.7"
           }
         },
+        "jest-worker": {
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
+          "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
+          "dev": true,
+          "requires": {
+            "merge-stream": "^2.0.0",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "merge-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+          "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+          "dev": true
+        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -1303,6 +1572,29 @@
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         },
+        "rsvp": {
+          "version": "4.8.5",
+          "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+          "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+          "dev": true
+        },
+        "sane": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+          "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+          "dev": true,
+          "requires": {
+            "@cnakazawa/watch": "^1.0.3",
+            "anymatch": "^2.0.0",
+            "capture-exit": "^2.0.0",
+            "exec-sh": "^0.3.2",
+            "execa": "^1.0.0",
+            "fb-watchman": "^2.0.0",
+            "micromatch": "^3.1.4",
+            "minimist": "^1.1.1",
+            "walker": "~1.0.5"
+          }
+        },
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -1311,6 +1603,15 @@
           "requires": {
             "ansi-regex": "^4.1.0"
           }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -1330,7 +1631,6 @@
       "version": "24.9.0",
       "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz",
       "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==",
-      "dev": true,
       "requires": {
         "@jest/types": "^24.9.0",
         "jest-message-util": "^24.9.0",
@@ -1366,6 +1666,22 @@
         "string-length": "^2.0.0"
       },
       "dependencies": {
+        "@cnakazawa/watch": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
+          "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
+          "dev": true,
+          "requires": {
+            "exec-sh": "^0.3.2",
+            "minimist": "^1.2.0"
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -1401,6 +1717,15 @@
             }
           }
         },
+        "capture-exit": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
+          "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
+          "dev": true,
+          "requires": {
+            "rsvp": "^4.8.4"
+          }
+        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -1410,6 +1735,12 @@
             "ms": "2.0.0"
           }
         },
+        "exec-sh": {
+          "version": "0.3.4",
+          "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
+          "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+          "dev": true
+        },
         "expand-brackets": {
           "version": "2.1.4",
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -1636,14 +1967,36 @@
             "walker": "^1.0.7"
           }
         },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+        "jest-worker": {
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
+          "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
           "dev": true,
           "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "merge-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+          "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
             "braces": "^2.3.1",
             "define-property": "^2.0.2",
             "extend-shallow": "^3.0.2",
@@ -1663,11 +2016,43 @@
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         },
+        "rsvp": {
+          "version": "4.8.5",
+          "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+          "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+          "dev": true
+        },
+        "sane": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+          "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+          "dev": true,
+          "requires": {
+            "@cnakazawa/watch": "^1.0.3",
+            "anymatch": "^2.0.0",
+            "capture-exit": "^2.0.0",
+            "exec-sh": "^0.3.2",
+            "execa": "^1.0.0",
+            "fb-watchman": "^2.0.0",
+            "micromatch": "^3.1.4",
+            "minimist": "^1.1.1",
+            "walker": "~1.0.5"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -1675,7 +2060,6 @@
       "version": "24.9.0",
       "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz",
       "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==",
-      "dev": true,
       "requires": {
         "callsites": "^3.0.0",
         "graceful-fs": "^4.1.15",
@@ -1685,14 +2069,12 @@
         "callsites": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-          "dev": true
+          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
         },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
@@ -1700,7 +2082,6 @@
       "version": "24.9.0",
       "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz",
       "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==",
-      "dev": true,
       "requires": {
         "@jest/console": "^24.9.0",
         "@jest/types": "^24.9.0",
@@ -1719,6 +2100,22 @@
         "jest-runtime": "^24.9.0"
       },
       "dependencies": {
+        "@cnakazawa/watch": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
+          "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
+          "dev": true,
+          "requires": {
+            "exec-sh": "^0.3.2",
+            "minimist": "^1.2.0"
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -1754,6 +2151,15 @@
             }
           }
         },
+        "capture-exit": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
+          "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
+          "dev": true,
+          "requires": {
+            "rsvp": "^4.8.4"
+          }
+        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -1763,6 +2169,12 @@
             "ms": "2.0.0"
           }
         },
+        "exec-sh": {
+          "version": "0.3.4",
+          "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
+          "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+          "dev": true
+        },
         "expand-brackets": {
           "version": "2.1.4",
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -1989,6 +2401,28 @@
             "walker": "^1.0.7"
           }
         },
+        "jest-worker": {
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
+          "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
+          "dev": true,
+          "requires": {
+            "merge-stream": "^2.0.0",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "merge-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+          "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+          "dev": true
+        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -2015,6 +2449,38 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
+        },
+        "rsvp": {
+          "version": "4.8.5",
+          "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+          "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+          "dev": true
+        },
+        "sane": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+          "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+          "dev": true,
+          "requires": {
+            "@cnakazawa/watch": "^1.0.3",
+            "anymatch": "^2.0.0",
+            "capture-exit": "^2.0.0",
+            "exec-sh": "^0.3.2",
+            "execa": "^1.0.0",
+            "fb-watchman": "^2.0.0",
+            "micromatch": "^3.1.4",
+            "minimist": "^1.1.1",
+            "walker": "~1.0.5"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -2042,6 +2508,22 @@
         "write-file-atomic": "2.4.1"
       },
       "dependencies": {
+        "@cnakazawa/watch": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
+          "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
+          "dev": true,
+          "requires": {
+            "exec-sh": "^0.3.2",
+            "minimist": "^1.2.0"
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -2077,6 +2559,15 @@
             }
           }
         },
+        "capture-exit": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
+          "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
+          "dev": true,
+          "requires": {
+            "rsvp": "^4.8.4"
+          }
+        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -2086,6 +2577,12 @@
             "ms": "2.0.0"
           }
         },
+        "exec-sh": {
+          "version": "0.3.4",
+          "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
+          "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+          "dev": true
+        },
         "expand-brackets": {
           "version": "2.1.4",
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -2312,6 +2809,28 @@
             "walker": "^1.0.7"
           }
         },
+        "jest-worker": {
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
+          "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
+          "dev": true,
+          "requires": {
+            "merge-stream": "^2.0.0",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "merge-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+          "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+          "dev": true
+        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -2339,12 +2858,44 @@
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         },
+        "rsvp": {
+          "version": "4.8.5",
+          "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+          "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+          "dev": true
+        },
+        "sane": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+          "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+          "dev": true,
+          "requires": {
+            "@cnakazawa/watch": "^1.0.3",
+            "anymatch": "^2.0.0",
+            "capture-exit": "^2.0.0",
+            "exec-sh": "^0.3.2",
+            "execa": "^1.0.0",
+            "fb-watchman": "^2.0.0",
+            "micromatch": "^3.1.4",
+            "minimist": "^1.1.1",
+            "walker": "~1.0.5"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
         "write-file-atomic": {
           "version": "2.4.1",
           "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz",
@@ -2362,175 +2913,131 @@
       "version": "24.9.0",
       "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
       "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-      "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^1.1.1",
         "@types/yargs": "^13.0.0"
       }
     },
-    "@react-native-community/cli": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-1.11.2.tgz",
-      "integrity": "sha512-5NuYd30f5PCTrGUbZLnusZKv5nfTWvTDTRa/3Q4vwdMnUQrhm9sZXWGQ5CnFoQ7cE58EAqhj6/ShXeJF3DZ9uQ==",
+    "@react-native-community/art": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@react-native-community/art/-/art-1.2.0.tgz",
+      "integrity": "sha512-a+ZcRGl/BzLa89yi33Mbn5SHavsEXqKUMdbfLf3U8MDLElndPqUetoJyGkv63+BcPO49UMWiQRP1YUz6/zfJ+A==",
       "requires": {
-        "chalk": "^1.1.1",
-        "commander": "^2.19.0",
-        "compression": "^1.7.1",
-        "connect": "^3.6.5",
-        "denodeify": "^1.2.1",
-        "envinfo": "^5.7.0",
-        "errorhandler": "^1.5.0",
-        "escape-string-regexp": "^1.0.5",
+        "art": "^0.10.3",
+        "invariant": "^2.2.4",
+        "prop-types": "^15.7.2"
+      }
+    },
+    "@react-native-community/cli-debugger-ui": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-3.0.0.tgz",
+      "integrity": "sha512-m3X+iWLsK/H7/b7PpbNO33eQayR/+M26la4ZbYe1KRke5Umg4PIWsvg21O8Tw4uJcY8LA5hsP+rBi/syBkBf0g==",
+      "requires": {
+        "serve-static": "^1.13.1"
+      }
+    },
+    "@react-native-community/cli-platform-android": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-android/-/cli-platform-android-3.1.4.tgz",
+      "integrity": "sha512-ClSdY20F0gzWVLTqCv7vHjnUqOcuq10jd9GgHX6lGSc2GI+Ql3/aQg3tmG4uY3KXNNwAv3U8QCoYgg1WGfwiHA==",
+      "requires": {
+        "@react-native-community/cli-tools": "^3.0.0",
+        "chalk": "^2.4.2",
         "execa": "^1.0.0",
-        "fs-extra": "^7.0.1",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.1.3",
-        "inquirer": "^3.0.6",
+        "jetifier": "^1.6.2",
+        "logkitty": "^0.6.0",
+        "slash": "^3.0.0",
+        "xmldoc": "^1.1.2"
+      },
+      "dependencies": {
+        "slash": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
+        }
+      }
+    },
+    "@react-native-community/cli-platform-ios": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-ios/-/cli-platform-ios-3.2.0.tgz",
+      "integrity": "sha512-pzEnx68H6+mHBq5jsMrr3UmAmkrLSMlC9BZ4yoUdfUXCQq6/R70zNYvH4hjUw8h2Al7Kgq53UzHUsM0ph8TSWQ==",
+      "requires": {
+        "@react-native-community/cli-tools": "^3.0.0",
+        "chalk": "^2.4.2",
+        "js-yaml": "^3.13.1",
+        "xcode": "^2.0.0"
+      }
+    },
+    "@react-native-community/cli-tools": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-tools/-/cli-tools-3.0.0.tgz",
+      "integrity": "sha512-8IhQKZdf3E4CR8T7HhkPGgorot/cLkRDgneJFDSWk/wCYZAuUh4NEAdumQV7N0jLSMWX7xxiWUPi94lOBxVY9g==",
+      "requires": {
+        "chalk": "^2.4.2",
         "lodash": "^4.17.5",
-        "metro": "^0.51.0",
-        "metro-config": "^0.51.0",
-        "metro-core": "^0.51.0",
-        "metro-memory-fs": "^0.51.0",
-        "metro-react-native-babel-transformer": "^0.51.0",
-        "mime": "^1.3.4",
-        "minimist": "^1.2.0",
-        "mkdirp": "^0.5.1",
-        "morgan": "^1.9.0",
-        "node-fetch": "^2.2.0",
-        "node-notifier": "^5.2.1",
-        "opn": "^3.0.2",
-        "plist": "^3.0.0",
-        "semver": "^5.0.3",
-        "serve-static": "^1.13.1",
-        "shell-quote": "1.6.1",
-        "slash": "^2.0.0",
-        "ws": "^1.1.0",
-        "xcode": "^2.0.0",
-        "xmldoc": "^0.4.0"
+        "mime": "^2.4.1",
+        "node-fetch": "^2.5.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "fs-extra": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
+        "mime": {
+          "version": "2.4.6",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="
         },
         "node-fetch": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-          "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+          "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
         }
       }
     },
+    "@react-native-community/cli-types": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-types/-/cli-types-3.0.0.tgz",
+      "integrity": "sha512-ng6Tm537E/M42GjE4TRUxQyL8sRfClcL7bQWblOCoxPZzJ2J3bdALsjeG3vDnVCIfI/R0AeFalN9KjMt0+Z/Zg=="
+    },
     "@react-navigation/core": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-3.5.1.tgz",
-      "integrity": "sha512-q7NyhWVYOhVIWqL2GZKa6G78YarXaVTTtOlSDkvy4ZIggo40wZzamlnrJRvsaQX46gsgw45FAWb5SriHh8o7eA==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-3.5.2.tgz",
+      "integrity": "sha512-HgKXci1h74aETgm5CXMBoIWG8R7VZG1eUUHYb3BdxwekdiZjW1P/srjiXzsCqFGlsESnVIOIkzT4DqI9J752Bw==",
       "requires": {
         "hoist-non-react-statics": "^3.3.0",
         "path-to-regexp": "^1.7.0",
         "query-string": "^6.4.2",
         "react-is": "^16.8.6"
+      }
+    },
+    "@react-navigation/native": {
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-3.6.5.tgz",
+      "integrity": "sha512-ttEmnokFVf09CvrkzlPIdfA693KfYcRxTYf9OZwp0Ll6El27UYjJD4arwGc+zvlohjTErCdba6CAKV702Wv28w==",
+      "requires": {
+        "hoist-non-react-statics": "^3.3.2",
+        "react-native-safe-area-view": "^0.14.8"
       },
       "dependencies": {
-        "hoist-non-react-statics": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
-          "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
-          "requires": {
-            "react-is": "^16.7.0"
-          }
-        },
-        "query-string": {
-          "version": "6.8.3",
-          "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.8.3.tgz",
-          "integrity": "sha512-llcxWccnyaWlODe7A9hRjkvdCKamEKTh+wH8ITdTc3OhchaqUZteiSCX/2ablWHVrkVIe04dntnaZJ7BdyW0lQ==",
-          "requires": {
-            "decode-uri-component": "^0.2.0",
-            "split-on-first": "^1.0.0",
-            "strict-uri-encode": "^2.0.0"
-          }
-        },
-        "react-is": {
-          "version": "16.10.2",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.10.2.tgz",
-          "integrity": "sha512-INBT1QEgtcCCgvccr5/86CfD71fw9EPmDxgiJX4I2Ddr6ZsV6iFXsuby+qWJPtmNuMY0zByTsG4468P7nHuNWA=="
-        }
-      }
-    },
-    "@react-navigation/native": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-3.6.2.tgz",
-      "integrity": "sha512-Cybeou6N82ZeRmgnGlu+wzlV3z5BZQR2dmYaNFV1TNLUGHqtvv8E7oNw9uYcz9Ox5LFbiX+FdNTn2d6ZPlK0kg==",
-      "requires": {
-        "hoist-non-react-statics": "^3.0.1",
-        "react-native-safe-area-view": "^0.14.1",
-        "react-native-screens": "^1.0.0 || ^1.0.0-alpha"
-      },
-      "dependencies": {
-        "hoist-non-react-statics": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
-          "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
+        "react-native-safe-area-view": {
+          "version": "0.14.9",
+          "resolved": "https://registry.npmjs.org/react-native-safe-area-view/-/react-native-safe-area-view-0.14.9.tgz",
+          "integrity": "sha512-WII/ulhpVyL/qbYb7vydq7dJAfZRBcEhg4/UWt6F6nAKpLa3gAceMOxBxI914ppwSP/TdUsandFy6lkJQE0z4A==",
           "requires": {
-            "react-is": "^16.7.0"
+            "hoist-non-react-statics": "^2.3.1"
+          },
+          "dependencies": {
+            "hoist-non-react-statics": {
+              "version": "2.5.5",
+              "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
+              "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
+            }
           }
         }
       }
     },
     "@types/babel__core": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.3.tgz",
-      "integrity": "sha512-8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA==",
+      "version": "7.1.8",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.8.tgz",
+      "integrity": "sha512-KXBiQG2OXvaPWFPDS1rD8yV9vO0OuWIqAEqLsbfX0oU2REN5KuoMnZ1gClWcBhO5I3n6oTVAmrMufOvRqdmFTQ==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -2541,9 +3048,9 @@
       }
     },
     "@types/babel__generator": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.0.tgz",
-      "integrity": "sha512-c1mZUu4up5cp9KROs/QAw0gTeHrw/x7m52LcnvMxxOZ03DmLwPV0MlGmlgzV3cnSdjhJOZsj7E7FHeioai+egw==",
+      "version": "7.6.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz",
+      "integrity": "sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.0.0"
@@ -2560,9 +3067,9 @@
       }
     },
     "@types/babel__traverse": {
-      "version": "7.0.7",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.7.tgz",
-      "integrity": "sha512-CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw==",
+      "version": "7.0.12",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.12.tgz",
+      "integrity": "sha512-t4CoEokHTfcyfb4hUaF9oOHu9RmmNWnm1CP0YmMqOOfClKascOmvlEM736vlqeScuGvBDsHkf8R2INd4DWreQA==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.3.0"
@@ -2574,39 +3081,36 @@
       "integrity": "sha1-jtIE2g9U6cjq7DGx7skeJRMtCCw="
     },
     "@types/invariant": {
-      "version": "2.2.30",
-      "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.30.tgz",
-      "integrity": "sha512-98fB+yo7imSD2F7PF7GIpELNgtLNgo5wjivu0W5V4jx+KVVJxo6p/qN4zdzSTBWy4/sN3pPyXwnhRSD28QX+ag=="
+      "version": "2.2.34",
+      "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.34.tgz",
+      "integrity": "sha512-lYUtmJ9BqUN688fGY1U1HZoWT1/Jrmgigx2loq4ZcJpICECm/Om3V314BxdzypO0u5PORKGMM6x0OXaljV1YFg=="
     },
     "@types/istanbul-lib-coverage": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
-      "integrity": "sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==",
-      "dev": true
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw=="
     },
     "@types/istanbul-lib-report": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz",
-      "integrity": "sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==",
-      "dev": true,
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
       "requires": {
         "@types/istanbul-lib-coverage": "*"
       }
     },
     "@types/istanbul-reports": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz",
-      "integrity": "sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==",
-      "dev": true,
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+      "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
       "requires": {
         "@types/istanbul-lib-coverage": "*",
         "@types/istanbul-lib-report": "*"
       }
     },
     "@types/lodash": {
-      "version": "4.14.144",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.144.tgz",
-      "integrity": "sha512-ogI4g9W5qIQQUhXAclq6zhqgqNUr7UlFaqDHbch7WLSLeeM/7d3CRaw7GLajxvyFvhJqw4Rpcz5bhoaYtIx6Tg=="
+      "version": "4.14.164",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.164.tgz",
+      "integrity": "sha512-fXCEmONnrtbYUc5014avwBeMdhHHO8YJCkOBflUL9EoJBSKZ1dei+VO74fA7JkTHZ1GvZack2TyIw5U+1lT8jg=="
     },
     "@types/lodash.zipobject": {
       "version": "4.1.6",
@@ -2616,16 +3120,46 @@
         "@types/lodash": "*"
       }
     },
+    "@types/prop-types": {
+      "version": "15.7.3",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz",
+      "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="
+    },
     "@types/qs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-Jugo5V/1bS0fRhy2z8+cUAHEyWOATaz4rbyLVvcFs7+dXp5HfwpEwzF1Q11bB10ApUqHf+yTauxI0UXQDwGrbA=="
+      "version": "6.9.5",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz",
+      "integrity": "sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ=="
+    },
+    "@types/react": {
+      "version": "16.9.36",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.36.tgz",
+      "integrity": "sha512-mGgUb/Rk/vGx4NCvquRuSH0GHBQKb1OqpGS9cT9lFxlTLHZgkksgI60TuIxubmn7JuCb+sENHhQciqa0npm0AQ==",
+      "requires": {
+        "@types/prop-types": "*",
+        "csstype": "^2.2.0"
+      }
+    },
+    "@types/react-native": {
+      "version": "0.62.13",
+      "resolved": "https://registry.npmjs.org/@types/react-native/-/react-native-0.62.13.tgz",
+      "integrity": "sha512-hs4/tSABhcJx+J8pZhVoXHrOQD89WFmbs8QiDLNSA9zNrD46pityAuBWuwk1aMjPk9I3vC5ewkJroVRHgRIfdg==",
+      "requires": {
+        "@types/react": "*"
+      }
+    },
+    "@types/react-native-vector-icons": {
+      "version": "6.4.5",
+      "resolved": "https://registry.npmjs.org/@types/react-native-vector-icons/-/react-native-vector-icons-6.4.5.tgz",
+      "integrity": "sha512-JBpcjWQE4n0GlE0p6HpDDclT+uXpFC453T5k4h+B38q0utlGJhvgNr8899BoJGc1xOktA2cgqFKmFMJd0h7YaA==",
+      "requires": {
+        "@types/react": "*",
+        "@types/react-native": "*"
+      }
     },
     "@types/stack-utils": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
-      "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
-      "dev": true
+      "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw=="
     },
     "@types/uuid-js": {
       "version": "0.7.2",
@@ -2638,32 +3172,30 @@
       "integrity": "sha1-Yhpman8CAY58u0q6uVaiVzbCfXE="
     },
     "@types/yargs": {
-      "version": "13.0.3",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.3.tgz",
-      "integrity": "sha512-K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ==",
-      "dev": true,
+      "version": "13.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
+      "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
       "requires": {
         "@types/yargs-parser": "*"
       }
     },
     "@types/yargs-parser": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.1.0.tgz",
-      "integrity": "sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==",
-      "dev": true
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
+      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="
     },
     "@unimodules/core": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@unimodules/core/-/core-4.0.0.tgz",
-      "integrity": "sha512-lHxRmCG9DK3/aA2lnBKPS32K95NpYE10mZQRp5dycSptgN0DIeWWHuE01SndcSUACGyEP+tDO+DnGo8mhLlt4Q==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@unimodules/core/-/core-5.0.0.tgz",
+      "integrity": "sha512-PswccfzFIviX61Lm8h6/QyC94bWe+6cARwhzgzTCKa6aR6azmi4732ExhX4VxfQjJNHB0szYVXGXVEDsFkj+tQ==",
       "requires": {
         "compare-versions": "^3.4.0"
       }
     },
     "@unimodules/react-native-adapter": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@unimodules/react-native-adapter/-/react-native-adapter-4.0.0.tgz",
-      "integrity": "sha512-zGAyDhqAEWvshdSxc523srP6OAZaSr95Cv5EuxLJbFGcJENHhK8o/qxhwS7/LYTF3LqtOlnSlwQta3v3y6kF4A==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@unimodules/react-native-adapter/-/react-native-adapter-5.0.0.tgz",
+      "integrity": "sha512-qb5p5wUQoi3TRa/33aLLHSnS7sewV99oBxIo9gnzNI3VFzbOm3rsbTjOJNcR2hx0raUolTtnQT75VbgagVQx4w==",
       "requires": {
         "invariant": "^2.2.4",
         "lodash": "^4.5.0",
@@ -2671,11 +3203,19 @@
       }
     },
     "abab": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.2.tgz",
-      "integrity": "sha512-2scffjvioEmNz0OyDSLGWDfKCVwaKc6l9Pm9kOIREU13ClXZvHpg/nRL5xyjSSSLhOnXqft2HpsAzNEEA8cFFg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
+      "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==",
       "dev": true
     },
+    "abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "requires": {
+        "event-target-shim": "^5.0.0"
+      }
+    },
     "absolute-path": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/absolute-path/-/absolute-path-0.0.0.tgz",
@@ -2691,9 +3231,9 @@
       }
     },
     "acorn": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-      "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
       "dev": true
     },
     "acorn-globals": {
@@ -2707,9 +3247,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
-          "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
           "dev": true
         }
       }
@@ -2721,22 +3261,17 @@
       "dev": true
     },
     "ajv": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+      "version": "6.12.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
+      "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "^2.0.1",
+        "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
         "json-schema-traverse": "^0.4.1",
         "uri-js": "^4.2.2"
       }
     },
-    "ansi": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
-      "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
-    },
     "ansi-colors": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
@@ -2758,6 +3293,31 @@
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
       "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
     },
+    "ansi-fragments": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-fragments/-/ansi-fragments-0.2.1.tgz",
+      "integrity": "sha512-DykbNHxuXQwUDRv5ibc2b0x7uw7wmwOGLBUd5RmaQ5z8Lhx19vwvKV+FAsM5rEA6dEcHxX+/Ad5s9eF2k2bB+w==",
+      "requires": {
+        "colorette": "^1.0.7",
+        "slice-ansi": "^2.0.0",
+        "strip-ansi": "^5.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
     "ansi-gray": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
@@ -2775,9 +3335,9 @@
       }
     },
     "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
     },
     "ansi-styles": {
       "version": "3.2.1",
@@ -2929,25 +3489,6 @@
             }
           }
         },
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          },
-          "dependencies": {
-            "is-extendable": {
-              "version": "1.0.1",
-              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-              "requires": {
-                "is-plain-object": "^2.0.4"
-              }
-            }
-          }
-        },
         "extglob": {
           "version": "2.0.4",
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
@@ -3052,9 +3593,9 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         },
         "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         },
         "micromatch": {
           "version": "3.1.10",
@@ -3083,15 +3624,6 @@
         }
       }
     },
-    "are-we-there-yet": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
-      }
-    },
     "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -3116,9 +3648,9 @@
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
     },
     "arr-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-      "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
     },
     "array-equal": {
       "version": "1.0.0",
@@ -3131,6 +3663,11 @@
       "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
       "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw="
     },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
+    },
     "array-map": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
@@ -3147,9 +3684,9 @@
       "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU="
     },
     "array-unique": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM="
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
     },
     "art": {
       "version": "0.10.3",
@@ -3184,8 +3721,7 @@
     "astral-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
-      "dev": true
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
     },
     "async": {
       "version": "2.6.3",
@@ -3193,13 +3729,6 @@
       "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
       "requires": {
         "lodash": "^4.17.14"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
-        }
       }
     },
     "async-each": {
@@ -3208,9 +3737,9 @@
       "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="
     },
     "async-limiter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
     },
     "asynckit": {
       "version": "0.4.0",
@@ -3230,9 +3759,9 @@
       "dev": true
     },
     "aws4": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz",
+      "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==",
       "dev": true
     },
     "babel-jest": {
@@ -3250,10 +3779,18 @@
         "slash": "^2.0.0"
       }
     },
+    "babel-plugin-dotenv": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dotenv/-/babel-plugin-dotenv-0.1.1.tgz",
+      "integrity": "sha1-nI+upnp8A0/n6UCZGHqy51c0ALw=",
+      "requires": {
+        "dotenv": "^2.0.0"
+      }
+    },
     "babel-plugin-dynamic-import-node": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz",
-      "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
       "requires": {
         "object.assign": "^4.1.0"
       }
@@ -3290,9 +3827,9 @@
           }
         },
         "p-limit": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -3341,6 +3878,22 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.11.7.tgz",
       "integrity": "sha512-CxE7uhhqkzAFkwV2X7+Mc/UVPujQQDtja/EGxCXRJvdYRi72QTmaJYKbK1lV9qgTZuB+TDguU89coaA9Z1BNbg=="
     },
+    "babel-plugin-styled-components": {
+      "version": "1.10.7",
+      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.10.7.tgz",
+      "integrity": "sha512-MBMHGcIA22996n9hZRf/UJLVVgkEOITuR2SvjHLb5dSTUyR4ZRGn+ngITapes36FI3WLxZHfRhkA1ffHxihOrg==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-module-imports": "^7.0.0",
+        "babel-plugin-syntax-jsx": "^6.18.0",
+        "lodash": "^4.17.11"
+      }
+    },
+    "babel-plugin-syntax-jsx": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY="
+    },
     "babel-plugin-syntax-trailing-function-commas": {
       "version": "7.0.0-beta.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz",
@@ -3359,130 +3912,6 @@
         "babel-plugin-module-resolver": "^3.1.1",
         "babel-plugin-react-native-web": "^0.11.2",
         "metro-react-native-babel-preset": "^0.54.1"
-      },
-      "dependencies": {
-        "@babel/helper-module-transforms": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz",
-          "integrity": "sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-module-imports": "^7.0.0",
-            "@babel/helper-simple-access": "^7.1.0",
-            "@babel/helper-split-export-declaration": "^7.4.4",
-            "@babel/template": "^7.4.4",
-            "@babel/types": "^7.5.5",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.4.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
-          "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.4.4"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.6.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.4.tgz",
-          "integrity": "sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A==",
-          "dev": true
-        },
-        "@babel/plugin-transform-modules-commonjs": {
-          "version": "7.6.0",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz",
-          "integrity": "sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-module-transforms": "^7.4.4",
-            "@babel/helper-plugin-utils": "^7.0.0",
-            "@babel/helper-simple-access": "^7.1.0",
-            "babel-plugin-dynamic-import-node": "^2.3.0"
-          }
-        },
-        "@babel/template": {
-          "version": "7.6.0",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz",
-          "integrity": "sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@babel/parser": "^7.6.0",
-            "@babel/types": "^7.6.0"
-          }
-        },
-        "@babel/types": {
-          "version": "7.6.3",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.3.tgz",
-          "integrity": "sha512-CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-          "dev": true
-        },
-        "metro-babel7-plugin-react-transform": {
-          "version": "0.54.1",
-          "resolved": "https://registry.npmjs.org/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.54.1.tgz",
-          "integrity": "sha512-jWm5myuMoZAOhoPsa8ItfDxdTcOzKhTTzzhFlbZnRamE7i9qybeMdrZt8KHQpF7i2p/mKzE9Yhf4ouOz5K/jHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-module-imports": "^7.0.0"
-          }
-        },
-        "metro-react-native-babel-preset": {
-          "version": "0.54.1",
-          "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.54.1.tgz",
-          "integrity": "sha512-Hfr32+u5yYl3qhYQJU8NQ26g4kQlc3yFMg7keVR/3H8rwBIbFqXgsKt8oe0dOrv7WvrMqBHhDtVdU9ls3sSq8g==",
-          "dev": true,
-          "requires": {
-            "@babel/plugin-proposal-class-properties": "^7.0.0",
-            "@babel/plugin-proposal-export-default-from": "^7.0.0",
-            "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
-            "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
-            "@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
-            "@babel/plugin-proposal-optional-chaining": "^7.0.0",
-            "@babel/plugin-syntax-dynamic-import": "^7.0.0",
-            "@babel/plugin-syntax-export-default-from": "^7.0.0",
-            "@babel/plugin-syntax-flow": "^7.2.0",
-            "@babel/plugin-transform-arrow-functions": "^7.0.0",
-            "@babel/plugin-transform-block-scoping": "^7.0.0",
-            "@babel/plugin-transform-classes": "^7.0.0",
-            "@babel/plugin-transform-computed-properties": "^7.0.0",
-            "@babel/plugin-transform-destructuring": "^7.0.0",
-            "@babel/plugin-transform-exponentiation-operator": "^7.0.0",
-            "@babel/plugin-transform-flow-strip-types": "^7.0.0",
-            "@babel/plugin-transform-for-of": "^7.0.0",
-            "@babel/plugin-transform-function-name": "^7.0.0",
-            "@babel/plugin-transform-literals": "^7.0.0",
-            "@babel/plugin-transform-modules-commonjs": "^7.0.0",
-            "@babel/plugin-transform-object-assign": "^7.0.0",
-            "@babel/plugin-transform-parameters": "^7.0.0",
-            "@babel/plugin-transform-react-display-name": "^7.0.0",
-            "@babel/plugin-transform-react-jsx": "^7.0.0",
-            "@babel/plugin-transform-react-jsx-source": "^7.0.0",
-            "@babel/plugin-transform-regenerator": "^7.0.0",
-            "@babel/plugin-transform-runtime": "^7.0.0",
-            "@babel/plugin-transform-shorthand-properties": "^7.0.0",
-            "@babel/plugin-transform-spread": "^7.0.0",
-            "@babel/plugin-transform-sticky-regex": "^7.0.0",
-            "@babel/plugin-transform-template-literals": "^7.0.0",
-            "@babel/plugin-transform-typescript": "^7.0.0",
-            "@babel/plugin-transform-unicode-regex": "^7.0.0",
-            "@babel/template": "^7.0.0",
-            "metro-babel7-plugin-react-transform": "0.54.1",
-            "react-transform-hmr": "^1.0.4"
-          }
-        }
       }
     },
     "babel-preset-fbjs": {
@@ -3588,9 +4017,9 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         },
         "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -3617,34 +4046,43 @@
       }
     },
     "big-integer": {
-      "version": "1.6.47",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.47.tgz",
-      "integrity": "sha512-9t9f7X3as2XGX8b52GqG6ox0GvIdM86LyIXASJnDCFhYNgt+A+MByQZ3W2PyMRZjEvG5f8TEbSPfEotVuMJnQg=="
+      "version": "1.6.48",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz",
+      "integrity": "sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w=="
     },
     "binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
       "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "blueimp-md5": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.12.0.tgz",
-      "integrity": "sha512-zo+HIdIhzojv6F1siQPqPFROyVy7C50KzHv/k/Iz+BtvtVzSHXiMXOpq2wCfNkeBqdCv+V8XOV96tsEt2W/3rQ=="
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.18.0.tgz",
+      "integrity": "sha512-vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q=="
     },
     "bplist-creator": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz",
-      "integrity": "sha1-N98VNgkoJLh8QvlXsBNEEXNyrkU=",
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.8.tgz",
+      "integrity": "sha512-Za9JKzD6fjLC16oX2wsXfc+qBEhJBJB1YPInoAQpMLhDuj5aVOv1baGeIQSq1Fr3OCqzvsoQcSBSwGId/Ja2PA==",
       "requires": {
         "stream-buffers": "~2.2.0"
       }
     },
     "bplist-parser": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
-      "integrity": "sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz",
+      "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==",
       "requires": {
-        "big-integer": "^1.6.7"
+        "big-integer": "^1.6.44"
       }
     },
     "brace-expansion": {
@@ -3657,19 +4095,36 @@
       }
     },
     "braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "requires": {
-        "expand-range": "^1.8.1",
-        "preserve": "^0.2.0",
-        "repeat-element": "^1.1.2"
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
       }
     },
     "browser-process-hrtime": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz",
-      "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
       "dev": true
     },
     "browser-resolve": {
@@ -3690,19 +4145,20 @@
       }
     },
     "browserslist": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.1.tgz",
-      "integrity": "sha512-/pPw5IAUyqaQXGuD5vS8tcbudyPZ241jk1W5pQBsGDfcjNQt7p8qxZhgMNuygDShte1PibLFexecWUPgmVLfrg==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
+      "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
       "requires": {
-        "caniuse-lite": "^1.0.30000949",
-        "electron-to-chromium": "^1.3.116",
-        "node-releases": "^1.1.11"
+        "caniuse-lite": "^1.0.30001043",
+        "electron-to-chromium": "^1.3.413",
+        "node-releases": "^1.1.53",
+        "pkg-up": "^2.0.0"
       }
     },
     "bser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz",
-      "integrity": "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
       "requires": {
         "node-int64": "^0.4.0"
       }
@@ -3790,17 +4246,22 @@
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
       "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
     },
+    "camelize": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz",
+      "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
+    },
     "caniuse-lite": {
-      "version": "1.0.30000951",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000951.tgz",
-      "integrity": "sha512-eRhP+nQ6YUkIcNQ6hnvdhMkdc7n3zadog0KXNRxAZTT2kHjUb1yGn71OrPhSn8MOvlX97g5CR97kGVj8fMsXWg=="
+      "version": "1.0.30001081",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001081.tgz",
+      "integrity": "sha512-iZdh3lu09jsUtLE6Bp8NAbJskco4Y3UDtkR3GTCJGsbMowBU5IWDFF79sV2ws7lSqTzWyKazxam2thasHymENQ=="
     },
     "capture-exit": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-1.2.0.tgz",
-      "integrity": "sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
+      "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
       "requires": {
-        "rsvp": "^3.3.3"
+        "rsvp": "^4.8.4"
       }
     },
     "caseless": {
@@ -3825,9 +4286,9 @@
       "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
     },
     "chokidar": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
-      "integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
       "requires": {
         "anymatch": "^2.0.0",
         "async-each": "^1.0.1",
@@ -3929,14 +4390,6 @@
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        },
         "normalize-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -3947,8 +4400,7 @@
     "ci-info": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-      "dev": true
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
     },
     "class-utils": {
       "version": "0.3.6",
@@ -3961,11 +4413,6 @@
         "static-extend": "^0.1.1"
       },
       "dependencies": {
-        "arr-union": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-          "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
-        },
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -3989,10 +4436,15 @@
         "restore-cursor": "^2.0.0"
       }
     },
+    "cli-spinners": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.5.0.tgz",
+      "integrity": "sha512-PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ=="
+    },
     "cli-width": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
+      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
     },
     "cliui": {
       "version": "3.2.0",
@@ -4004,6 +4456,14 @@
         "wrap-ansi": "^2.0.0"
       },
       "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
         "string-width": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -4016,6 +4476,11 @@
         }
       }
     },
+    "clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
+    },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -4037,9 +4502,9 @@
       }
     },
     "color": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color/-/color-2.0.1.tgz",
-      "integrity": "sha512-ubUCVVKfT7r2w2D3qtHakj8mbmKms+tThR8gI8zEYCbUBl8/voqFGt3kgBqGwXAopgXybnkuOq+qMYCRrp4cXw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
+      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
       "requires": {
         "color-convert": "^1.9.1",
         "color-string": "^1.5.2"
@@ -4072,6 +4537,11 @@
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
       "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="
     },
+    "colorette": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz",
+      "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw=="
+    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -4081,6 +4551,11 @@
         "delayed-stream": "~1.0.0"
       }
     },
+    "command-exists": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
+      "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
+    },
     "commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -4092,21 +4567,21 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
     },
     "compare-versions": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.5.1.tgz",
-      "integrity": "sha512-9fGPIB7C6AyM18CJJBHt5EnCZDG3oiTJYy0NjfIAGjKpzv0tkxWko7TNQHF5ymqm7IH03tqmeuBxtvD+Izh6mg=="
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
+      "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA=="
     },
     "component-emitter": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
     },
     "compressible": {
-      "version": "2.0.17",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
-      "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==",
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "requires": {
-        "mime-db": ">= 1.40.0 < 2"
+        "mime-db": ">= 1.43.0 < 2"
       }
     },
     "compression": {
@@ -4181,9 +4656,9 @@
       }
     },
     "convert-source-map": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
-      "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
       "requires": {
         "safe-buffer": "~5.1.1"
       }
@@ -4194,26 +4669,26 @@
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
     },
     "core-js": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.0.0.tgz",
-      "integrity": "sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ=="
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+      "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
     },
     "core-js-compat": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.0.0.tgz",
-      "integrity": "sha512-W/Ppz34uUme3LmXWjMgFlYyGnbo1hd9JvA0LNQ4EmieqVjg2GPYbj3H6tcdP2QGPGWdRKUqZVbVKLNIFVs/HiA==",
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
+      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
       "requires": {
-        "browserslist": "^4.5.1",
-        "core-js": "3.0.0",
-        "core-js-pure": "3.0.0",
-        "semver": "^5.6.0"
+        "browserslist": "^4.8.5",
+        "semver": "7.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="
+        }
       }
     },
-    "core-js-pure": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.0.0.tgz",
-      "integrity": "sha512-yPiS3fQd842RZDgo/TAKGgS0f3p2nxssF1H65DIZvZv0Od5CygP8puHXn3IQiM/39VAvgCbdaMQpresrbGgt9g=="
-    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -4241,9 +4716,9 @@
       }
     },
     "create-react-context": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.2.tgz",
-      "integrity": "sha512-KkpaLARMhsTsgp0d2NA/R94F/eDLbhXERdIq3LvX2biCAXcDvHYoOqHfWCHf1+OLj+HKBotLG3KqaOOf+C1C+A==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.3.tgz",
+      "integrity": "sha512-CQBmD0+QGgTaxDL3OX1IDXYqjkp2It4RIbcb99jS6AEg27Ga+a9G3JtK6SIu0HBwPLZlmwt9F7UwWA4Bn92Rag==",
       "requires": {
         "fbjs": "^0.8.0",
         "gud": "^1.0.0"
@@ -4261,6 +4736,37 @@
         "which": "^1.2.9"
       }
     },
+    "css-color-keywords": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
+      "integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU="
+    },
+    "css-in-js-utils": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/css-in-js-utils/-/css-in-js-utils-2.0.1.tgz",
+      "integrity": "sha512-PJF0SpJT+WdbVVt0AOYp9C8GnuruRlL/UFW7932nLWmFLQTaWEzTBQEx7/hn4BuV+WON75iAViSUJLiU3PKbpA==",
+      "requires": {
+        "hyphenate-style-name": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        }
+      }
+    },
+    "css-to-react-native": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.0.0.tgz",
+      "integrity": "sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==",
+      "requires": {
+        "camelize": "^1.0.0",
+        "css-color-keywords": "^1.0.0",
+        "postcss-value-parser": "^4.0.2"
+      }
+    },
     "cssom": {
       "version": "0.3.8",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
@@ -4276,6 +4782,11 @@
         "cssom": "0.3.x"
       }
     },
+    "csstype": {
+      "version": "2.6.10",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.10.tgz",
+      "integrity": "sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w=="
+    },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -4309,6 +4820,16 @@
         }
       }
     },
+    "dayjs": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.9.4.tgz",
+      "integrity": "sha512-ABSF3alrldf7nM9sQ2U+Ln67NRwmzlLOqG7kK03kck0mw3wlSSEKv/XhKGGxUjQcS57QeiCyNdrFgtj9nWlrng=="
+    },
+    "debounce": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.0.tgz",
+      "integrity": "sha512-mYtLl1xfZLi1m4RtQYlZgJUNQjl4ZxVnHzIR8nLLgi4q1YT8o/WM+MK/f8yfcc9s5Ir5zRaPZyZU6xs1Syoocg=="
+    },
     "debug": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -4327,6 +4848,14 @@
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
     },
+    "deep-assign": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/deep-assign/-/deep-assign-3.0.0.tgz",
+      "integrity": "sha512-YX2i9XjJ7h5q/aQ/IM9PEwEnDqETAIYbggmdDB3HLTlSgo1CxPsj6pvhPG68rq6SVE0+p+6Ywsm5fTYNrYtBWw==",
+      "requires": {
+        "is-obj": "^1.0.0"
+      }
+    },
     "deep-is": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
@@ -4334,9 +4863,17 @@
       "dev": true
     },
     "deepmerge": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz",
-      "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.3.0.tgz",
+      "integrity": "sha512-GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA=="
+    },
+    "defaults": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
+      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+      "requires": {
+        "clone": "^1.0.2"
+      }
     },
     "define-properties": {
       "version": "1.1.3",
@@ -4387,9 +4924,9 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         },
         "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -4399,11 +4936,6 @@
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
       "dev": true
     },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
-    },
     "denodeify": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/denodeify/-/denodeify-1.2.1.tgz",
@@ -4425,6 +4957,11 @@
       "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
       "dev": true
     },
+    "didyoumean": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.1.tgz",
+      "integrity": "sha1-6S7f2tplN9SE1zwBcv0eugxJdv8="
+    },
     "diff-sequences": {
       "version": "24.9.0",
       "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
@@ -4432,9 +4969,10 @@
       "dev": true
     },
     "dom-walk": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz",
-      "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg="
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
+      "dev": true
     },
     "domexception": {
       "version": "1.0.1",
@@ -4445,6 +4983,11 @@
         "webidl-conversions": "^4.0.2"
       }
     },
+    "dotenv": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-2.0.0.tgz",
+      "integrity": "sha1-vXWcNXqqcDZeAclrewvsCKbg2Uk="
+    },
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -4461,9 +5004,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "electron-to-chromium": {
-      "version": "1.3.116",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.116.tgz",
-      "integrity": "sha512-NKwKAXzur5vFCZYBHpdWjTMO8QptNLNP80nItkSIgUOapPAo9Uia+RvkCaZJtO7fhQaVElSvBPWEc2ku6cKsPA=="
+      "version": "1.3.466",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.466.tgz",
+      "integrity": "sha512-eieqkoM2hCkZZRhETKyCouMziDV3l4XEKHRLuzcHG+HV+P7PeODU/z9HAmBgMQkzvHg2DoyQhfIDmmeguLZT/Q=="
     },
     "emoji-regex": {
       "version": "7.0.3",
@@ -4484,17 +5027,17 @@
       }
     },
     "end-of-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
       "requires": {
         "once": "^1.4.0"
       }
     },
     "envinfo": {
-      "version": "5.12.1",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-5.12.1.tgz",
-      "integrity": "sha512-pwdo0/G3CIkQ0y6PCXq4RdkvId2elvtPCJMG0konqlrfkWQbf1DWeH9K2b/cvu2YgGvPPTOnonZxXM1gikFu1w=="
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.7.3.tgz",
+      "integrity": "sha512-46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA=="
     },
     "error-ex": {
       "version": "1.3.2",
@@ -4514,35 +5057,28 @@
       }
     },
     "es-abstract": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz",
-      "integrity": "sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==",
+      "version": "1.17.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+      "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
       "dev": true,
       "requires": {
-        "es-to-primitive": "^1.2.0",
+        "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.0",
-        "is-callable": "^1.1.4",
-        "is-regex": "^1.0.4",
-        "object-inspect": "^1.6.0",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.1.5",
+        "is-regex": "^1.0.5",
+        "object-inspect": "^1.7.0",
         "object-keys": "^1.1.1",
-        "string.prototype.trimleft": "^2.1.0",
-        "string.prototype.trimright": "^2.1.0"
-      },
-      "dependencies": {
-        "object-keys": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-          "dev": true
-        }
+        "object.assign": "^4.1.0",
+        "string.prototype.trimleft": "^2.1.1",
+        "string.prototype.trimright": "^2.1.1"
       }
     },
     "es-to-primitive": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
-      "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "dev": true,
       "requires": {
         "is-callable": "^1.1.4",
@@ -4561,24 +5097,18 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz",
-      "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.2.tgz",
+      "integrity": "sha512-InuOIiKk8wwuOFg6x9BQXbzjrQhtyXh46K9bqVTPzSo2FnyMBaYGBMC6PhQy7yxxil9vIedFBweQBMK74/7o8A==",
       "dev": true,
       "requires": {
-        "esprima": "^3.1.3",
+        "esprima": "^4.0.1",
         "estraverse": "^4.2.0",
         "esutils": "^2.0.2",
         "optionator": "^0.8.1",
         "source-map": "~0.6.1"
       },
       "dependencies": {
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -4600,9 +5130,9 @@
       "dev": true
     },
     "esutils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
     },
     "etag": {
       "version": "1.8.1",
@@ -4610,9 +5140,9 @@
       "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
     },
     "event-target-shim": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-1.1.1.tgz",
-      "integrity": "sha1-qG5e5r2qFgVEddp5fM3fDFVphJE="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
     },
     "eventemitter3": {
       "version": "3.1.2",
@@ -4620,37 +5150,22 @@
       "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="
     },
     "exec-sh": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
-      "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
-      "requires": {
-        "merge": "^1.2.0"
-      }
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
+      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A=="
     },
     "execa": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
       "requires": {
-        "cross-spawn": "^5.0.1",
-        "get-stream": "^3.0.0",
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
         "is-stream": "^1.1.0",
         "npm-run-path": "^2.0.0",
         "p-finally": "^1.0.0",
         "signal-exit": "^3.0.0",
         "strip-eof": "^1.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        }
       }
     },
     "exit": {
@@ -4660,19 +5175,48 @@
       "dev": true
     },
     "expand-brackets": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-      "requires": {
-        "is-posix-bracket": "^0.1.0"
-      }
-    },
-    "expand-range": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "requires": {
-        "fill-range": "^2.1.0"
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
       }
     },
     "expect": {
@@ -4690,9 +5234,9 @@
       }
     },
     "expo": {
-      "version": "35.0.0",
-      "resolved": "https://registry.npmjs.org/expo/-/expo-35.0.0.tgz",
-      "integrity": "sha512-DnwcDiRds+y4C+XsfvFnyG8c/vJZWx9RYgcDn0yhu07LtQ2osxKnqSm5eko3uAU3jFYxGUxdlN1xs9p1u0MDXg==",
+      "version": "36.0.2",
+      "resolved": "https://registry.npmjs.org/expo/-/expo-36.0.2.tgz",
+      "integrity": "sha512-A0HkOBr6PkHUCcPmmTRmZQHE68EYhWDevFHAiv7fSZxNACmTq9arrSoON+UiPtGQEIV5OyV+MN/joHTJMduTkA==",
       "requires": {
         "@babel/runtime": "^7.1.2",
         "@expo/vector-icons": "^10.0.2",
@@ -4701,21 +5245,22 @@
         "@types/lodash.zipobject": "^4.1.4",
         "@types/qs": "^6.5.1",
         "@types/uuid-js": "^0.7.1",
-        "@unimodules/core": "~4.0.0",
-        "@unimodules/react-native-adapter": "~4.0.0",
-        "babel-preset-expo": "~7.0.0",
+        "@unimodules/core": "~5.0.0",
+        "@unimodules/react-native-adapter": "~5.0.0",
+        "babel-preset-expo": "~8.0.0",
         "cross-spawn": "^6.0.5",
-        "expo-app-loader-provider": "~7.0.0",
-        "expo-asset": "~7.0.0",
-        "expo-constants": "~7.0.0",
-        "expo-file-system": "~7.0.0",
-        "expo-font": "~7.0.0",
-        "expo-keep-awake": "~7.0.0",
-        "expo-linear-gradient": "~7.0.0",
-        "expo-location": "~7.0.0",
-        "expo-permissions": "~7.0.0",
-        "expo-sqlite": "~7.0.0",
-        "expo-web-browser": "~7.0.0",
+        "expo-app-loader-provider": "~8.0.0",
+        "expo-asset": "~8.0.0",
+        "expo-constants": "~8.0.0",
+        "expo-error-recovery": "~1.0.0",
+        "expo-file-system": "~8.0.0",
+        "expo-font": "~8.0.0",
+        "expo-keep-awake": "~8.0.0",
+        "expo-linear-gradient": "~8.0.0",
+        "expo-location": "~8.0.0",
+        "expo-permissions": "~8.0.0",
+        "expo-sqlite": "~8.0.0",
+        "expo-web-browser": "~8.0.0",
         "fbemitter": "^2.1.1",
         "invariant": "^2.2.2",
         "lodash": "^4.6.0",
@@ -4724,136 +5269,63 @@
         "pretty-format": "^23.6.0",
         "prop-types": "^15.6.0",
         "qs": "^6.5.0",
-        "react-native-branch": "~3.0.1",
-        "react-native-view-shot": "2.6.0",
+        "react-native-view-shot": "3.0.2",
         "serialize-error": "^2.1.0",
-        "unimodules-barcode-scanner-interface": "~4.0.0",
-        "unimodules-camera-interface": "~4.0.0",
-        "unimodules-constants-interface": "~4.0.0",
-        "unimodules-face-detector-interface": "~4.0.0",
-        "unimodules-file-system-interface": "~4.0.0",
-        "unimodules-font-interface": "~4.0.0",
-        "unimodules-image-loader-interface": "~4.0.0",
-        "unimodules-permissions-interface": "~4.0.0",
-        "unimodules-sensors-interface": "~4.0.0",
-        "unimodules-task-manager-interface": "~4.0.0",
+        "unimodules-barcode-scanner-interface": "~5.0.0",
+        "unimodules-camera-interface": "~5.0.0",
+        "unimodules-constants-interface": "~5.0.0",
+        "unimodules-face-detector-interface": "~5.0.0",
+        "unimodules-file-system-interface": "~5.0.0",
+        "unimodules-font-interface": "~5.0.0",
+        "unimodules-image-loader-interface": "~5.0.0",
+        "unimodules-permissions-interface": "~5.0.0",
+        "unimodules-sensors-interface": "~5.0.0",
+        "unimodules-task-manager-interface": "~5.0.0",
         "uuid-js": "^0.7.5"
       },
       "dependencies": {
-        "@babel/helper-module-transforms": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz",
-          "integrity": "sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw==",
-          "requires": {
-            "@babel/helper-module-imports": "^7.0.0",
-            "@babel/helper-simple-access": "^7.1.0",
-            "@babel/helper-split-export-declaration": "^7.4.4",
-            "@babel/template": "^7.4.4",
-            "@babel/types": "^7.5.5",
-            "lodash": "^4.17.13"
-          },
-          "dependencies": {
-            "lodash": {
-              "version": "4.17.15",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-              "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
-            }
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.4.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
-          "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
-          "requires": {
-            "@babel/types": "^7.4.4"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.6.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.4.tgz",
-          "integrity": "sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A=="
-        },
-        "@babel/plugin-transform-modules-commonjs": {
-          "version": "7.6.0",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz",
-          "integrity": "sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g==",
-          "requires": {
-            "@babel/helper-module-transforms": "^7.4.4",
-            "@babel/helper-plugin-utils": "^7.0.0",
-            "@babel/helper-simple-access": "^7.1.0",
-            "babel-plugin-dynamic-import-node": "^2.3.0"
-          }
-        },
-        "@babel/template": {
-          "version": "7.6.0",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz",
-          "integrity": "sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==",
+        "babel-preset-expo": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/babel-preset-expo/-/babel-preset-expo-8.0.0.tgz",
+          "integrity": "sha512-40UCIE4E+9Xx5K+oEidFHML2+j/WE/ikcC7+3ndWx74MtdmRAtnGecboKRiGUK/vMrHzXIcWPP6/SOnE7zQVgQ==",
           "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@babel/parser": "^7.6.0",
-            "@babel/types": "^7.6.0"
+            "@babel/plugin-proposal-decorators": "^7.6.0",
+            "@babel/preset-env": "^7.6.3",
+            "babel-plugin-module-resolver": "^3.2.0",
+            "babel-plugin-react-native-web": "^0.11.7",
+            "metro-react-native-babel-preset": "^0.56.0"
           }
         },
-        "@babel/types": {
-          "version": "7.6.3",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.3.tgz",
-          "integrity": "sha512-CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA==",
+        "expo-constants": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-8.0.0.tgz",
+          "integrity": "sha512-NGRwSWfhwNFA9WVLXwqnSDPJJ4DdXTqEkl9Fr9PcyW5VCoFgz7uke256E1YZsYhOE0Ph365lu/5jjZs+MRmRog==",
           "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          },
-          "dependencies": {
-            "lodash": {
-              "version": "4.17.15",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-              "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
-            }
+            "ua-parser-js": "^0.7.19"
           }
         },
-        "babel-preset-expo": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/babel-preset-expo/-/babel-preset-expo-7.0.0.tgz",
-          "integrity": "sha512-lhQUlodOf1pJoDQ4X1SpLLiQQutvAJ3eB2xZtcqQFY0SAc7ifchtgWk/1T9SmI8lCOcllcPsFDyjbcPWav1FHQ==",
+        "expo-file-system": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/expo-file-system/-/expo-file-system-8.0.0.tgz",
+          "integrity": "sha512-mi84jt3EHVUfxu5eGOikNuRDi7+5daCFSP9LVgk5aQz8Oepo143vnH/+WE4lQEg+u8dB6EmmCWncyc2Fklxv7A==",
           "requires": {
-            "@babel/core": "^7.1.0",
-            "@babel/plugin-proposal-decorators": "^7.1.0",
-            "@babel/plugin-transform-modules-commonjs": "^7.4.4",
-            "@babel/preset-env": "^7.3.1",
-            "babel-plugin-module-resolver": "^3.1.1",
-            "babel-plugin-react-native-web": "^0.11.2",
-            "metro-react-native-babel-preset": "^0.54.1"
+            "uuid-js": "^0.7.5"
           }
         },
         "expo-sqlite": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/expo-sqlite/-/expo-sqlite-7.0.0.tgz",
-          "integrity": "sha512-mUA+YiE42sD7jI64kP+Zmhwzk13KoLVSFGJz5HeuAuIoO1EwVlAH4g+RQQye5/NsFM6clVRvKhIxv2L2XIVEcw==",
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/expo-sqlite/-/expo-sqlite-8.0.0.tgz",
+          "integrity": "sha512-nJBj1psOkYGIGh2hqMFV/+04EvfGAD3wkHMauUvveU6m/+c48GIxmesPMMDfqtzESgzMcVSKLfbiMYrdQJyrHg==",
           "requires": {
             "@expo/websql": "^1.0.1",
             "@types/websql": "^0.0.27",
             "lodash": "^4.17.15"
-          },
-          "dependencies": {
-            "lodash": {
-              "version": "4.17.15",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-              "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
-            }
-          }
-        },
-        "metro-babel7-plugin-react-transform": {
-          "version": "0.54.1",
-          "resolved": "https://registry.npmjs.org/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.54.1.tgz",
-          "integrity": "sha512-jWm5myuMoZAOhoPsa8ItfDxdTcOzKhTTzzhFlbZnRamE7i9qybeMdrZt8KHQpF7i2p/mKzE9Yhf4ouOz5K/jHg==",
-          "requires": {
-            "@babel/helper-module-imports": "^7.0.0"
           }
         },
         "metro-react-native-babel-preset": {
-          "version": "0.54.1",
-          "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.54.1.tgz",
-          "integrity": "sha512-Hfr32+u5yYl3qhYQJU8NQ26g4kQlc3yFMg7keVR/3H8rwBIbFqXgsKt8oe0dOrv7WvrMqBHhDtVdU9ls3sSq8g==",
+          "version": "0.56.4",
+          "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.56.4.tgz",
+          "integrity": "sha512-CzbBDM9Rh6w8s1fq+ZqihAh7DDqUAcfo9pPww25+N/eJ7UK436Q7JdfxwdIPpBwLFn6o6MyYn+uwL9OEWBJarA==",
           "requires": {
             "@babel/plugin-proposal-class-properties": "^7.0.0",
             "@babel/plugin-proposal-export-default-from": "^7.0.0",
@@ -4889,21 +5361,20 @@
             "@babel/plugin-transform-typescript": "^7.0.0",
             "@babel/plugin-transform-unicode-regex": "^7.0.0",
             "@babel/template": "^7.0.0",
-            "metro-babel7-plugin-react-transform": "0.54.1",
-            "react-transform-hmr": "^1.0.4"
+            "react-refresh": "^0.4.0"
           }
         }
       }
     },
     "expo-app-loader-provider": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/expo-app-loader-provider/-/expo-app-loader-provider-7.0.0.tgz",
-      "integrity": "sha512-C+5zpZN2T7PCj7weLs/ZgAC+y9dvu0VdTXD00Jf9Wo7Pxu/lsLh6ljg9JL91c+2tYDzMEODPNmT+JOUIxAr5zQ=="
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/expo-app-loader-provider/-/expo-app-loader-provider-8.0.0.tgz",
+      "integrity": "sha512-uMEdstZdm14JW8jfWXBWItIjGPNBH7cLj2pNu5e0pYF21W4j759rGL17NTNWit4UdLZg/zJB/HHRidVwEINfxA=="
     },
     "expo-asset": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/expo-asset/-/expo-asset-7.0.0.tgz",
-      "integrity": "sha512-MwWrlpzaZqT0NU0V3Wn8oA1pMb7Al49aYAWMPEUZ2UV5NyVAbzYPuS2duIfwX55ivczjJZHpwrhd0hb/3l9ngQ==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/expo-asset/-/expo-asset-8.0.0.tgz",
+      "integrity": "sha512-ICPptpetXB+v88Sqr8yMVEA46UNlUUb8AMbyUytdUJqV7V2itHDQywl08ofOlOICzNgjDFIQdCs3crkTVQ1Zng==",
       "requires": {
         "blueimp-md5": "^2.10.0",
         "path-browserify": "^1.0.0",
@@ -4927,6 +5398,11 @@
         "ua-parser-js": "^0.7.19"
       }
     },
+    "expo-error-recovery": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/expo-error-recovery/-/expo-error-recovery-1.0.0.tgz",
+      "integrity": "sha512-xnxciNEpGmwxx8BAE2A9fd9HxtzWtz8p9mikKU+EfWgOXaYD3FJwgbFoVLD2pm4QUarxwOcic76rcwg+0cNnGg=="
+    },
     "expo-file-system": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/expo-file-system/-/expo-file-system-7.0.0.tgz",
@@ -4936,35 +5412,35 @@
       }
     },
     "expo-font": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/expo-font/-/expo-font-7.0.0.tgz",
-      "integrity": "sha512-OVlUydfexjq1u57Xlymcx5egfFF2WZ5MXkg3GGjHyiSMfp09inZ7OzAu+O/TXjxjlaq9d6vBXiwVxqQoUIlx1Q==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/expo-font/-/expo-font-8.0.0.tgz",
+      "integrity": "sha512-1hrlvxv8MpE1761v2mDjZRwhhM4hkfDr/MQlkWD2+g17N+UjU3WQct4kc+VuZW30pP+YowwrmG3O6JVoIOhWGA==",
       "requires": {
         "fontfaceobserver": "^2.1.0"
       }
     },
     "expo-keep-awake": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/expo-keep-awake/-/expo-keep-awake-7.0.0.tgz",
-      "integrity": "sha512-LjIudbftcZnoviujJUZEzLMdE3m9A2NOvxrRszYHUjySpNN1bAKKyx1gLJbg/yZIWcdEIQ+6uCYtLbuK74Wk2Q=="
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/expo-keep-awake/-/expo-keep-awake-8.0.0.tgz",
+      "integrity": "sha512-l+672FVu9qqBEFKSXL1jrsQoDky7gTJX6WYLTWc0/hJuTMhVowWUHsOh/L9vxJEt23QtqLyszQ+hBqjQnWvICQ=="
     },
     "expo-linear-gradient": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/expo-linear-gradient/-/expo-linear-gradient-7.0.1.tgz",
-      "integrity": "sha512-YJsvA7nx8sMcV1+XhIsqT5+tyHhJi87AxgFW4fBlvUr9gAXhPMvUwkNMPPIkyOpKiEMPuQ7yWS29qwZdOHBGFQ=="
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/expo-linear-gradient/-/expo-linear-gradient-8.0.0.tgz",
+      "integrity": "sha512-5G3ePGAHUoyBWbGITw5RtdJpssH8TXhCgt55cV+5LTTFjr51OZcuOmGua1vRoVFKBC/9ibLW465GEx9H/HS07Q=="
     },
     "expo-location": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/expo-location/-/expo-location-7.0.0.tgz",
-      "integrity": "sha512-7iWg0j6+DXeO/bVLJEbGBmvebPSbIJNOewfHoyhvdo+13Q7L94SflcggT349WbqNsFJHVcAGC6Unr8VvXcUDbw==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/expo-location/-/expo-location-8.0.0.tgz",
+      "integrity": "sha512-48i4dUCaqPTwSri79yummKwg6vE6loI7d4iHCrbG4EEuN3fhS8I9xU60CEkoNZTziH9zK0iw4KSjr7DbXUAaCw==",
       "requires": {
         "invariant": "^2.2.4"
       }
     },
     "expo-permissions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/expo-permissions/-/expo-permissions-7.0.0.tgz",
-      "integrity": "sha512-C+qyVz+pdZO4YpVR2HSC3gsBZg0Qb8brCFgzmDmWcAtgrOiHClaLPdhI2XtQuGh8ubXcKPUGZp++UCEGiG0Jxg=="
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/expo-permissions/-/expo-permissions-8.0.0.tgz",
+      "integrity": "sha512-GHTRmwh1rd1b0FcibluPFu93NNQyl9b1anBBDVPmomoo9Prz7kDcO5p2hFqM99r896yvAUSe0fPloPKUq4g/1A=="
     },
     "expo-sqlite": {
       "version": "7.0.0",
@@ -4974,19 +5450,12 @@
         "@expo/websql": "^1.0.1",
         "@types/websql": "^0.0.27",
         "lodash": "^4.17.15"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
-        }
       }
     },
     "expo-web-browser": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/expo-web-browser/-/expo-web-browser-7.0.1.tgz",
-      "integrity": "sha512-THjqlMitUsjHUGYEfag2ybdhgZpp0C4ATixfNpWlS/8vTM4Sw/KGfwB0VuqtqLUMT2q2MTJSrlrWY8Boi4yvTg=="
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/expo-web-browser/-/expo-web-browser-8.0.0.tgz",
+      "integrity": "sha512-7/rXUajycSjEF4Zd4tWm8+zP9/zJg8UWj575w2AeGI7RbOwUjqzQd1CFRzQBJkHflrEaTOXJbFHXxjJXdJaL1g=="
     },
     "extend": {
       "version": "3.0.2",
@@ -5024,11 +5493,67 @@
       }
     },
     "extglob": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "requires": {
-        "is-extglob": "^1.0.0"
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+        }
       }
     },
     "extsprintf": {
@@ -5049,15 +5574,15 @@
       }
     },
     "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
     "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
       "dev": true
     },
     "fast-levenshtein": {
@@ -5067,11 +5592,11 @@
       "dev": true
     },
     "fb-watchman": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz",
-      "integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
+      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
       "requires": {
-        "bser": "^2.0.0"
+        "bser": "2.1.1"
       }
     },
     "fbemitter": {
@@ -5094,13 +5619,6 @@
         "promise": "^7.1.1",
         "setimmediate": "^1.0.5",
         "ua-parser-js": "^0.7.18"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-          "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
-        }
       }
     },
     "fbjs-css-vars": {
@@ -5126,9 +5644,9 @@
       },
       "dependencies": {
         "core-js": {
-          "version": "2.6.10",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz",
-          "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA=="
+          "version": "2.6.11",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
         },
         "cross-spawn": {
           "version": "5.1.0",
@@ -5150,21 +5668,31 @@
         "escape-string-regexp": "^1.0.5"
       }
     },
-    "filename-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY="
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "optional": true
     },
     "fill-range": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "requires": {
-        "is-number": "^2.1.0",
-        "isobject": "^2.0.0",
-        "randomatic": "^3.0.0",
-        "repeat-element": "^1.1.2",
-        "repeat-string": "^1.5.2"
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
       }
     },
     "finalhandler": {
@@ -5242,11 +5770,6 @@
         "yargs": "^11.0.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        },
         "cliui": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
@@ -5267,14 +5790,44 @@
             "universalify": "^0.1.0"
           }
         },
-        "jsonfile": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        },
+        "invert-kv": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
+        },
+        "lcid": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+          "requires": {
+            "invert-kv": "^2.0.0"
+          }
+        },
+        "mem": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+          "requires": {
+            "map-age-cleaner": "^0.1.1",
+            "mimic-fn": "^2.0.0",
+            "p-is-promise": "^2.0.0"
+          }
+        },
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+        },
+        "os-locale": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+          "requires": {
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
+          }
+        },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -5284,15 +5837,15 @@
           }
         },
         "yargs": {
-          "version": "11.1.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
-          "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
+          "version": "11.1.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz",
+          "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
           "requires": {
             "cliui": "^4.0.0",
             "decamelize": "^1.1.1",
             "find-up": "^2.1.0",
             "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
+            "os-locale": "^3.1.0",
             "require-directory": "^2.1.1",
             "require-main-filename": "^1.0.1",
             "set-blocking": "^2.0.0",
@@ -5322,14 +5875,6 @@
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
     },
-    "for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-      "requires": {
-        "for-in": "^1.0.1"
-      }
-    },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -5361,23 +5906,13 @@
       "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
     },
     "fs-extra": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz",
-      "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
       "requires": {
         "graceful-fs": "^4.1.2",
-        "jsonfile": "^2.1.0",
-        "klaw": "^1.0.0"
-      },
-      "dependencies": {
-        "jsonfile": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        }
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
       }
     },
     "fs.realpath": {
@@ -5386,787 +5921,280 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz",
-      "integrity": "sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
       "optional": true,
       "requires": {
-        "nan": "^2.9.2",
-        "node-pre-gyp": "^0.10.0"
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      }
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "gensync": {
+      "version": "1.0.0-beta.1",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
+      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="
+    },
+    "get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+    },
+    "get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "global": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+      "dev": true,
+      "requires": {
+        "min-document": "^2.19.0",
+        "process": "^0.11.10"
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+    },
+    "graceful-fs": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
+    },
+    "growly": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE="
+    },
+    "gud": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
+      "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.5.5",
+        "har-schema": "^2.0.0"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+    },
+    "has-symbols": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
       },
       "dependencies": {
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true,
-          "optional": true
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true
-        },
-        "aproba": {
-          "version": "1.2.0",
-          "bundled": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.5",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
-          }
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "chownr": {
-          "version": "1.1.1",
-          "bundled": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "optional": true
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "optional": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "debug": {
-          "version": "2.6.9",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "deep-extend": {
-          "version": "0.6.0",
-          "bundled": true,
-          "optional": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "detect-libc": {
-          "version": "1.0.3",
-          "bundled": true,
-          "optional": true
-        },
-        "fs-minipass": {
-          "version": "1.2.5",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.2.1"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.3",
-          "bundled": true,
-          "optional": true,
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        }
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "bundled": true,
-          "optional": true,
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
+            "is-buffer": "^1.1.5"
           }
-        },
-        "ignore-walk": {
-          "version": "3.0.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "minimatch": "^3.0.4"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true,
-          "optional": true
-        },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "optional": true
-        },
-        "minipass": {
-          "version": "2.3.5",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
-          }
-        },
-        "minizlib": {
-          "version": "1.2.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.2.1"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "needle": {
-          "version": "2.2.4",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "debug": "^2.1.2",
-            "iconv-lite": "^0.4.4",
-            "sax": "^1.2.4"
-          }
-        },
-        "node-pre-gyp": {
-          "version": "0.10.3",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "detect-libc": "^1.0.2",
-            "mkdirp": "^0.5.1",
-            "needle": "^2.2.1",
-            "nopt": "^4.0.1",
-            "npm-packlist": "^1.1.6",
-            "npmlog": "^4.0.2",
-            "rc": "^1.2.7",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^4"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
-          }
-        },
-        "npm-bundled": {
-          "version": "1.0.5",
-          "bundled": true,
-          "optional": true
-        },
-        "npm-packlist": {
-          "version": "1.2.0",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.8",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "^0.6.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.3",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "bundled": true
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true,
-          "optional": true
-        },
-        "sax": {
-          "version": "1.2.4",
-          "bundled": true,
-          "optional": true
-        },
-        "semver": {
-          "version": "5.6.0",
-          "bundled": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "4.4.8",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.4",
-            "minizlib": "^1.1.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.2"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "wide-align": {
-          "version": "1.1.3",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "string-width": "^1.0.2 || 2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "yallist": {
-          "version": "3.0.3",
-          "bundled": true
         }
       }
     },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    "hermes-engine": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/hermes-engine/-/hermes-engine-0.2.1.tgz",
+      "integrity": "sha512-eNHUQHuadDMJARpaqvlCZoK/Nitpj6oywq3vQ3wCwEsww5morX34mW5PmKWQTO7aU0ck0hgulxR+EVDlXygGxQ=="
     },
-    "gauge": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz",
-      "integrity": "sha1-6c7FSD09TuDvRLYKfZnkk14TbZM=",
+    "hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
       "requires": {
-        "ansi": "^0.3.0",
-        "has-unicode": "^2.0.0",
-        "lodash.pad": "^4.1.0",
-        "lodash.padend": "^4.1.0",
-        "lodash.padstart": "^4.1.0"
+        "react-is": "^16.7.0"
       }
     },
-    "get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
-    },
-    "get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
-    },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+    "hosted-git-info": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
     },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+    "html-encoding-sniffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
+      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0"
+        "whatwg-encoding": "^1.0.1"
       }
     },
-    "glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
+    "html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
     },
-    "glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+    "http-errors": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
+      "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
       "requires": {
-        "glob-parent": "^2.0.0",
-        "is-glob": "^2.0.0"
+        "depd": "~1.1.2",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
       }
     },
-    "glob-parent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
       "requires": {
-        "is-glob": "^2.0.0"
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
       }
     },
-    "global": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
-      "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
+    "hyphenate-style-name": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz",
+      "integrity": "sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ=="
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "requires": {
-        "min-document": "^2.19.0",
-        "process": "~0.5.1"
+        "safer-buffer": ">= 2.1.2 < 3"
       }
     },
-    "globals": {
-      "version": "11.11.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz",
-      "integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw=="
-    },
-    "graceful-fs": {
-      "version": "4.1.15",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
+    "image-size": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.6.3.tgz",
+      "integrity": "sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA=="
     },
-    "growly": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
-      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE="
+    "immediate": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
+      "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q=="
     },
-    "gud": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
-      "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
+    "import-fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+      "requires": {
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
+      }
     },
-    "handlebars": {
-      "version": "4.4.5",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.4.5.tgz",
-      "integrity": "sha512-0Ce31oWVB7YidkaTq33ZxEbN+UDxMMgThvCe8ptgQViymL5DPis9uLdTA13MiRPhgvqyxIegugrP97iK3JeBHg==",
+    "import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
       "dev": true,
       "requires": {
-        "neo-async": "^2.6.0",
-        "optimist": "^0.6.1",
-        "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
-    },
-    "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
-      }
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-    },
-    "has-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
-      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
-    },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-    },
-    "has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
-        }
-      }
-    },
-    "has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "hoist-non-react-statics": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
-      "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
-    },
-    "hosted-git-info": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
-    },
-    "html-encoding-sniffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
-      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
-      "dev": true,
-      "requires": {
-        "whatwg-encoding": "^1.0.1"
-      }
-    },
-    "http-errors": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
-      "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
-      "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-        }
-      }
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "image-size": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.6.3.tgz",
-      "integrity": "sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA=="
-    },
-    "immediate": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.2.3.tgz",
-      "integrity": "sha1-0UD6j2FGWb1lQSMwl92qwlzdmRw="
-    },
-    "import-fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
-      "requires": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
-      }
-    },
-    "import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
-      "dev": true,
-      "requires": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
       }
     },
     "imurmurhash": {
@@ -6184,9 +6212,17 @@
       }
     },
     "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "inline-style-prefixer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-5.1.2.tgz",
+      "integrity": "sha512-PYUF+94gDfhy+LsQxM0g3d6Hge4l1pAqOSOiZuHWzMvQEGsbRQ/ck2WioLqrY2ZkHyPgVUXxn+hrkF7D6QUGbA==",
+      "requires": {
+        "css-in-js-utils": "^2.0.0"
+      }
     },
     "inquirer": {
       "version": "3.3.0",
@@ -6209,11 +6245,6 @@
         "through": "^2.3.6"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -6243,16 +6274,6 @@
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "requires": {
         "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
       }
     },
     "is-arrayish": {
@@ -6274,16 +6295,15 @@
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
     "is-callable": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
       "dev": true
     },
     "is-ci": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
       "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-      "dev": true,
       "requires": {
         "ci-info": "^2.0.0"
       }
@@ -6294,22 +6314,12 @@
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "requires": {
         "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
       }
     },
     "is-date-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
       "dev": true
     },
     "is-descriptor": {
@@ -6334,36 +6344,15 @@
       "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
       "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE="
     },
-    "is-dotfile": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE="
-    },
-    "is-equal-shallow": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-      "requires": {
-        "is-primitive": "^2.0.0"
-      }
-    },
     "is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
     },
-    "is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
-    },
     "is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
     },
     "is-generator-fn": {
       "version": "2.1.0",
@@ -6371,32 +6360,19 @@
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
       "dev": true
     },
-    "is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-      "requires": {
-        "is-extglob": "^1.0.0"
-      }
-    },
     "is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "requires": {
         "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
       }
     },
+    "is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
+    },
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -6412,28 +6388,13 @@
         }
       }
     },
-    "is-posix-bracket": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q="
-    },
-    "is-primitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
-    },
-    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
-    },
     "is-regex": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
       "dev": true,
       "requires": {
-        "has": "^1.0.1"
+        "has-symbols": "^1.0.1"
       }
     },
     "is-stream": {
@@ -6442,12 +6403,12 @@
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
     },
     "is-symbol": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
-      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
       "dev": true,
       "requires": {
-        "has-symbols": "^1.0.0"
+        "has-symbols": "^1.0.1"
       }
     },
     "is-typedarray": {
@@ -6477,12 +6438,9 @@
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-      "requires": {
-        "isarray": "1.0.0"
-      }
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
     },
     "isomorphic-fetch": {
       "version": "2.2.1",
@@ -6520,114 +6478,29 @@
         "semver": "^6.0.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
-          "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.0.0"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.4.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
-          "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.4.4"
-          },
-          "dependencies": {
-            "@babel/types": {
-              "version": "7.6.3",
-              "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.3.tgz",
-              "integrity": "sha512-CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA==",
-              "dev": true,
-              "requires": {
-                "esutils": "^2.0.2",
-                "lodash": "^4.17.13",
-                "to-fast-properties": "^2.0.0"
-              }
-            }
-          }
-        },
-        "@babel/parser": {
-          "version": "7.6.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.4.tgz",
-          "integrity": "sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A==",
-          "dev": true
-        },
-        "@babel/traverse": {
-          "version": "7.6.3",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.3.tgz",
-          "integrity": "sha512-unn7P4LGsijIxaAJo/wpoU11zN+2IaClkQAxcJWBNCMS6cmVh802IyLHNkAjQ0iYnRS3nnxk5O3fuXW28IMxTw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.5.5",
-            "@babel/generator": "^7.6.3",
-            "@babel/helper-function-name": "^7.1.0",
-            "@babel/helper-split-export-declaration": "^7.4.4",
-            "@babel/parser": "^7.6.3",
-            "@babel/types": "^7.6.3",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
-          },
-          "dependencies": {
-            "@babel/generator": {
-              "version": "7.6.4",
-              "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.6.4.tgz",
-              "integrity": "sha512-jsBuXkFoZxk0yWLyGI9llT9oiQ2FeTASmRFE32U+aaDTfoE92t78eroO7PTpU/OrYq38hlcDM6vbfLDaOLy+7w==",
-              "dev": true,
-              "requires": {
-                "@babel/types": "^7.6.3",
-                "jsesc": "^2.5.1",
-                "lodash": "^4.17.13",
-                "source-map": "^0.5.0"
-              }
-            },
-            "@babel/types": {
-              "version": "7.6.3",
-              "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.3.tgz",
-              "integrity": "sha512-CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA==",
-              "dev": true,
-              "requires": {
-                "esutils": "^2.0.2",
-                "lodash": "^4.17.13",
-                "to-fast-properties": "^2.0.0"
-              }
-            }
-          }
-        },
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "istanbul-lib-report": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz",
-      "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
-      "dev": true,
-      "requires": {
-        "istanbul-lib-coverage": "^2.0.5",
-        "make-dir": "^2.1.0",
-        "supports-color": "^6.1.0"
-      },
-      "dependencies": {
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "istanbul-lib-report": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz",
+      "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
+      "dev": true,
+      "requires": {
+        "istanbul-lib-coverage": "^2.0.5",
+        "make-dir": "^2.1.0",
+        "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
           "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
@@ -6657,12 +6530,12 @@
       }
     },
     "istanbul-reports": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz",
-      "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==",
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz",
+      "integrity": "sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==",
       "dev": true,
       "requires": {
-        "handlebars": "^4.1.2"
+        "html-escaper": "^2.0.0"
       }
     },
     "jest-changed-files": {
@@ -6674,32 +6547,6 @@
         "@jest/types": "^24.9.0",
         "execa": "^1.0.0",
         "throat": "^4.0.0"
-      },
-      "dependencies": {
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        }
       }
     },
     "jest-config": {
@@ -6733,6 +6580,12 @@
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -6983,6 +6836,12 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -7178,12 +7037,6 @@
           "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
           "dev": true
         },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
         "jest": {
           "version": "24.9.0",
           "resolved": "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz",
@@ -7228,9 +7081,9 @@
           }
         },
         "p-limit": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -7295,9 +7148,9 @@
           "dev": true
         },
         "yargs": {
-          "version": "13.3.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
-          "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
           "dev": true,
           "requires": {
             "cliui": "^5.0.0",
@@ -7309,13 +7162,13 @@
             "string-width": "^3.0.0",
             "which-module": "^2.0.0",
             "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.1"
+            "yargs-parser": "^13.1.2"
           }
         },
         "yargs-parser": {
-          "version": "13.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
@@ -7327,23 +7180,153 @@
     "jest-get-type": {
       "version": "24.9.0",
       "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
-      "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
-      "dev": true
+      "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q=="
     },
     "jest-haste-map": {
-      "version": "24.0.0-alpha.6",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.0.0-alpha.6.tgz",
-      "integrity": "sha512-+NO2HMbjvrG8BC39ieLukdpFrcPhhjCJGhpbHodHNZygH1Tt06WrlNYGpZtWKx/zpf533tCtMQXO/q59JenjNw==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz",
+      "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==",
       "requires": {
+        "@jest/types": "^24.9.0",
+        "anymatch": "^2.0.0",
         "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.1.11",
+        "fsevents": "^1.2.7",
+        "graceful-fs": "^4.1.15",
         "invariant": "^2.2.4",
-        "jest-serializer": "^24.0.0-alpha.6",
-        "jest-worker": "^24.0.0-alpha.6",
-        "micromatch": "^2.3.11",
-        "sane": "^3.0.0"
+        "jest-serializer": "^24.9.0",
+        "jest-util": "^24.9.0",
+        "jest-worker": "^24.9.0",
+        "micromatch": "^3.1.10",
+        "sane": "^4.0.3",
+        "walker": "^1.0.7"
+      }
+    },
+    "jest-jasmine2": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz",
+      "integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==",
+      "dev": true,
+      "requires": {
+        "@babel/traverse": "^7.1.0",
+        "@jest/environment": "^24.9.0",
+        "@jest/test-result": "^24.9.0",
+        "@jest/types": "^24.9.0",
+        "chalk": "^2.0.1",
+        "co": "^4.6.0",
+        "expect": "^24.9.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^24.9.0",
+        "jest-matcher-utils": "^24.9.0",
+        "jest-message-util": "^24.9.0",
+        "jest-runtime": "^24.9.0",
+        "jest-snapshot": "^24.9.0",
+        "jest-util": "^24.9.0",
+        "pretty-format": "^24.9.0",
+        "throat": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "pretty-format": {
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
+          "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^24.9.0",
+            "ansi-regex": "^4.0.0",
+            "ansi-styles": "^3.2.0",
+            "react-is": "^16.8.4"
+          }
+        }
+      }
+    },
+    "jest-leak-detector": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz",
+      "integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==",
+      "dev": true,
+      "requires": {
+        "jest-get-type": "^24.9.0",
+        "pretty-format": "^24.9.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "pretty-format": {
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
+          "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^24.9.0",
+            "ansi-regex": "^4.0.0",
+            "ansi-styles": "^3.2.0",
+            "react-is": "^16.8.4"
+          }
+        }
+      }
+    },
+    "jest-matcher-utils": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz",
+      "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.1",
+        "jest-diff": "^24.9.0",
+        "jest-get-type": "^24.9.0",
+        "pretty-format": "^24.9.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "pretty-format": {
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
+          "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^24.9.0",
+            "ansi-regex": "^4.0.0",
+            "ansi-styles": "^3.2.0",
+            "react-is": "^16.8.4"
+          }
+        }
+      }
+    },
+    "jest-message-util": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
+      "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@jest/test-result": "^24.9.0",
+        "@jest/types": "^24.9.0",
+        "@types/stack-utils": "^1.0.1",
+        "chalk": "^2.0.1",
+        "micromatch": "^3.1.10",
+        "slash": "^2.0.0",
+        "stack-utils": "^1.0.1"
       },
       "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+        },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -7384,20 +7367,6 @@
             "ms": "2.0.0"
           }
         },
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
         "expand-brackets": {
           "version": "2.1.4",
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -7535,14 +7504,6 @@
             }
           }
         },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
@@ -7592,174 +7553,125 @@
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         },
-        "sane": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/sane/-/sane-3.1.0.tgz",
-          "integrity": "sha512-G5GClRRxT1cELXfdAq7UKtUsv8q/ZC5k8lQGmjEm4HcAl3HzBy68iglyNCmw4+0tiXPCBZntslHlRhbnsSws+Q==",
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
           "requires": {
-            "anymatch": "^2.0.0",
-            "capture-exit": "^1.2.0",
-            "exec-sh": "^0.2.0",
-            "execa": "^1.0.0",
-            "fb-watchman": "^2.0.0",
-            "fsevents": "^1.2.3",
-            "micromatch": "^3.1.4",
-            "minimist": "^1.1.1",
-            "walker": "~1.0.5",
-            "watch": "~0.18.0"
-          },
-          "dependencies": {
-            "micromatch": {
-              "version": "3.1.10",
-              "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-              "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-              "requires": {
-                "arr-diff": "^4.0.0",
-                "array-unique": "^0.3.2",
-                "braces": "^2.3.1",
-                "define-property": "^2.0.2",
-                "extend-shallow": "^3.0.2",
-                "extglob": "^2.0.4",
-                "fragment-cache": "^0.2.1",
-                "kind-of": "^6.0.2",
-                "nanomatch": "^1.2.9",
-                "object.pick": "^1.3.0",
-                "regex-not": "^1.0.0",
-                "snapdragon": "^0.8.1",
-                "to-regex": "^3.0.2"
-              }
-            }
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
           }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         }
       }
     },
-    "jest-jasmine2": {
+    "jest-mock": {
       "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz",
-      "integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz",
+      "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==",
       "requires": {
-        "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^24.9.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "chalk": "^2.0.1",
-        "co": "^4.6.0",
-        "expect": "^24.9.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^24.9.0",
-        "jest-matcher-utils": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-runtime": "^24.9.0",
-        "jest-snapshot": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "pretty-format": "^24.9.0",
-        "throat": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "pretty-format": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
-          "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
-          "dev": true,
-          "requires": {
-            "@jest/types": "^24.9.0",
-            "ansi-regex": "^4.0.0",
-            "ansi-styles": "^3.2.0",
-            "react-is": "^16.8.4"
-          }
-        }
+        "@jest/types": "^24.9.0"
       }
     },
-    "jest-leak-detector": {
+    "jest-pnp-resolver": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz",
+      "integrity": "sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==",
+      "dev": true
+    },
+    "jest-regex-util": {
       "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz",
-      "integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
+      "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
+      "dev": true
+    },
+    "jest-resolve": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
+      "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
       "dev": true,
       "requires": {
-        "jest-get-type": "^24.9.0",
-        "pretty-format": "^24.9.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "pretty-format": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
-          "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
-          "dev": true,
-          "requires": {
-            "@jest/types": "^24.9.0",
-            "ansi-regex": "^4.0.0",
-            "ansi-styles": "^3.2.0",
-            "react-is": "^16.8.4"
-          }
-        }
+        "@jest/types": "^24.9.0",
+        "browser-resolve": "^1.11.3",
+        "chalk": "^2.0.1",
+        "jest-pnp-resolver": "^1.2.1",
+        "realpath-native": "^1.1.0"
       }
     },
-    "jest-matcher-utils": {
+    "jest-resolve-dependencies": {
       "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz",
-      "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz",
+      "integrity": "sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==",
       "dev": true,
       "requires": {
-        "chalk": "^2.0.1",
-        "jest-diff": "^24.9.0",
-        "jest-get-type": "^24.9.0",
-        "pretty-format": "^24.9.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "pretty-format": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
-          "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
-          "dev": true,
-          "requires": {
-            "@jest/types": "^24.9.0",
-            "ansi-regex": "^4.0.0",
-            "ansi-styles": "^3.2.0",
-            "react-is": "^16.8.4"
-          }
-        }
+        "@jest/types": "^24.9.0",
+        "jest-regex-util": "^24.3.0",
+        "jest-snapshot": "^24.9.0"
       }
     },
-    "jest-message-util": {
+    "jest-runner": {
       "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
-      "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz",
+      "integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
+        "@jest/console": "^24.7.1",
+        "@jest/environment": "^24.9.0",
         "@jest/test-result": "^24.9.0",
         "@jest/types": "^24.9.0",
-        "@types/stack-utils": "^1.0.1",
-        "chalk": "^2.0.1",
-        "micromatch": "^3.1.10",
-        "slash": "^2.0.0",
-        "stack-utils": "^1.0.1"
+        "chalk": "^2.4.2",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.1.15",
+        "jest-config": "^24.9.0",
+        "jest-docblock": "^24.3.0",
+        "jest-haste-map": "^24.9.0",
+        "jest-jasmine2": "^24.9.0",
+        "jest-leak-detector": "^24.9.0",
+        "jest-message-util": "^24.9.0",
+        "jest-resolve": "^24.9.0",
+        "jest-runtime": "^24.9.0",
+        "jest-util": "^24.9.0",
+        "jest-worker": "^24.6.0",
+        "source-map-support": "^0.5.6",
+        "throat": "^4.0.0"
       },
       "dependencies": {
+        "@cnakazawa/watch": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
+          "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
+          "dev": true,
+          "requires": {
+            "exec-sh": "^0.3.2",
+            "minimist": "^1.2.0"
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -7795,6 +7707,15 @@
             }
           }
         },
+        "capture-exit": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
+          "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
+          "dev": true,
+          "requires": {
+            "rsvp": "^4.8.4"
+          }
+        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -7804,6 +7725,12 @@
             "ms": "2.0.0"
           }
         },
+        "exec-sh": {
+          "version": "0.3.4",
+          "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
+          "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+          "dev": true
+        },
         "expand-brackets": {
           "version": "2.1.4",
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -8010,6 +7937,48 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
         },
+        "jest-haste-map": {
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz",
+          "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^24.9.0",
+            "anymatch": "^2.0.0",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^1.2.7",
+            "graceful-fs": "^4.1.15",
+            "invariant": "^2.2.4",
+            "jest-serializer": "^24.9.0",
+            "jest-util": "^24.9.0",
+            "jest-worker": "^24.9.0",
+            "micromatch": "^3.1.10",
+            "sane": "^4.0.3",
+            "walker": "^1.0.7"
+          }
+        },
+        "jest-worker": {
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
+          "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
+          "dev": true,
+          "requires": {
+            "merge-stream": "^2.0.0",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "merge-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+          "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+          "dev": true
+        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -8036,81 +8005,94 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
+        },
+        "rsvp": {
+          "version": "4.8.5",
+          "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+          "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+          "dev": true
+        },
+        "sane": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+          "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+          "dev": true,
+          "requires": {
+            "@cnakazawa/watch": "^1.0.3",
+            "anymatch": "^2.0.0",
+            "capture-exit": "^2.0.0",
+            "exec-sh": "^0.3.2",
+            "execa": "^1.0.0",
+            "fb-watchman": "^2.0.0",
+            "micromatch": "^3.1.4",
+            "minimist": "^1.1.1",
+            "walker": "~1.0.5"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
-    "jest-mock": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz",
-      "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^24.9.0"
-      }
-    },
-    "jest-pnp-resolver": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz",
-      "integrity": "sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==",
-      "dev": true
-    },
-    "jest-regex-util": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
-      "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
-      "dev": true
-    },
-    "jest-resolve": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
-      "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "browser-resolve": "^1.11.3",
-        "chalk": "^2.0.1",
-        "jest-pnp-resolver": "^1.2.1",
-        "realpath-native": "^1.1.0"
-      }
-    },
-    "jest-resolve-dependencies": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz",
-      "integrity": "sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "jest-regex-util": "^24.3.0",
-        "jest-snapshot": "^24.9.0"
-      }
-    },
-    "jest-runner": {
+    "jest-runtime": {
       "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz",
-      "integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz",
+      "integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==",
       "dev": true,
       "requires": {
         "@jest/console": "^24.7.1",
         "@jest/environment": "^24.9.0",
-        "@jest/test-result": "^24.9.0",
+        "@jest/source-map": "^24.3.0",
+        "@jest/transform": "^24.9.0",
         "@jest/types": "^24.9.0",
-        "chalk": "^2.4.2",
+        "@types/yargs": "^13.0.0",
+        "chalk": "^2.0.1",
         "exit": "^0.1.2",
+        "glob": "^7.1.3",
         "graceful-fs": "^4.1.15",
         "jest-config": "^24.9.0",
-        "jest-docblock": "^24.3.0",
         "jest-haste-map": "^24.9.0",
-        "jest-jasmine2": "^24.9.0",
-        "jest-leak-detector": "^24.9.0",
         "jest-message-util": "^24.9.0",
+        "jest-mock": "^24.9.0",
+        "jest-regex-util": "^24.3.0",
         "jest-resolve": "^24.9.0",
-        "jest-runtime": "^24.9.0",
+        "jest-snapshot": "^24.9.0",
         "jest-util": "^24.9.0",
-        "jest-worker": "^24.6.0",
-        "source-map-support": "^0.5.6",
-        "throat": "^4.0.0"
+        "jest-validate": "^24.9.0",
+        "realpath-native": "^1.1.0",
+        "slash": "^2.0.0",
+        "strip-bom": "^3.0.0",
+        "yargs": "^13.3.0"
       },
       "dependencies": {
+        "@cnakazawa/watch": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
+          "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
+          "dev": true,
+          "requires": {
+            "exec-sh": "^0.3.2",
+            "minimist": "^1.2.0"
+          }
+        },
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -8146,6 +8128,32 @@
             }
           }
         },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
+        "capture-exit": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
+          "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
+          "dev": true,
+          "requires": {
+            "rsvp": "^4.8.4"
+          }
+        },
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "dev": true,
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          }
+        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -8155,6 +8163,12 @@
             "ms": "2.0.0"
           }
         },
+        "exec-sh": {
+          "version": "0.3.4",
+          "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
+          "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+          "dev": true
+        },
         "expand-brackets": {
           "version": "2.1.4",
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -8306,6 +8320,21 @@
             }
           }
         },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+          "dev": true
+        },
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
@@ -8381,6 +8410,38 @@
             "walker": "^1.0.7"
           }
         },
+        "jest-worker": {
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
+          "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
+          "dev": true,
+          "requires": {
+            "merge-stream": "^2.0.0",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "merge-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+          "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+          "dev": true
+        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -8407,480 +8468,128 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
-        }
-      }
-    },
-    "jest-runtime": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz",
-      "integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==",
-      "dev": true,
-      "requires": {
-        "@jest/console": "^24.7.1",
-        "@jest/environment": "^24.9.0",
-        "@jest/source-map": "^24.3.0",
-        "@jest/transform": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "@types/yargs": "^13.0.0",
-        "chalk": "^2.0.1",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.1.15",
-        "jest-config": "^24.9.0",
-        "jest-haste-map": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-mock": "^24.9.0",
-        "jest-regex-util": "^24.3.0",
-        "jest-resolve": "^24.9.0",
-        "jest-snapshot": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-validate": "^24.9.0",
-        "realpath-native": "^1.1.0",
-        "slash": "^2.0.0",
-        "strip-bom": "^3.0.0",
-        "yargs": "^13.3.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
         },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "p-try": "^2.0.0"
           }
         },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
+            "p-limit": "^2.0.0"
           }
         },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
         },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
-              }
-            },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+          "dev": true
         },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
+        "rsvp": {
+          "version": "4.8.5",
+          "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+          "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+          "dev": true
         },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+        "sane": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+          "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "@cnakazawa/watch": "^1.0.3",
+            "anymatch": "^2.0.0",
+            "capture-exit": "^2.0.0",
+            "exec-sh": "^0.3.2",
+            "execa": "^1.0.0",
+            "fb-watchman": "^2.0.0",
+            "micromatch": "^3.1.4",
+            "minimist": "^1.1.1",
+            "walker": "~1.0.5"
           }
         },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
           }
         },
-        "get-caller-file": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-          "dev": true
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "ansi-regex": "^4.1.0"
           }
         },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "has-flag": "^3.0.0"
           }
         },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
           }
         },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+        "y18n": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
           "dev": true
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+        "yargs": {
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "jest-haste-map": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz",
-          "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==",
-          "dev": true,
-          "requires": {
-            "@jest/types": "^24.9.0",
-            "anymatch": "^2.0.0",
-            "fb-watchman": "^2.0.0",
-            "fsevents": "^1.2.7",
-            "graceful-fs": "^4.1.15",
-            "invariant": "^2.2.4",
-            "jest-serializer": "^24.9.0",
-            "jest-util": "^24.9.0",
-            "jest-worker": "^24.9.0",
-            "micromatch": "^3.1.10",
-            "sane": "^4.0.3",
-            "walker": "^1.0.7"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "p-limit": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
-        "require-main-filename": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.0",
-            "string-width": "^3.0.0",
-            "strip-ansi": "^5.0.0"
-          }
-        },
-        "y18n": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-          "dev": true
-        },
-        "yargs": {
-          "version": "13.3.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
-          "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
-          "dev": true,
-          "requires": {
-            "cliui": "^5.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.1"
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.2"
           }
         },
         "yargs-parser": {
-          "version": "13.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
@@ -8945,7 +8654,6 @@
       "version": "24.9.0",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz",
       "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==",
-      "dev": true,
       "requires": {
         "@jest/console": "^24.9.0",
         "@jest/fake-timers": "^24.9.0",
@@ -8964,14 +8672,12 @@
         "callsites": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-          "dev": true
+          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
         },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
@@ -8979,7 +8685,6 @@
       "version": "24.9.0",
       "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz",
       "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==",
-      "dev": true,
       "requires": {
         "@jest/types": "^24.9.0",
         "camelcase": "^5.3.1",
@@ -8992,20 +8697,17 @@
         "ansi-regex": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
         },
         "camelcase": {
           "version": "5.3.1",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
         },
         "pretty-format": {
           "version": "24.9.0",
           "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
           "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
-          "dev": true,
           "requires": {
             "@jest/types": "^24.9.0",
             "ansi-regex": "^4.0.0",
@@ -9027,13 +8729,14 @@
       }
     },
     "jest-watch-typeahead": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-0.4.0.tgz",
-      "integrity": "sha512-bJR/HPNgOQnkmttg1OkBIrYFAYuxFxExtgQh67N2qPvaWGVC8TCkedRNPKBfmZfVXFD3u2sCH+9OuS5ApBfCgA==",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-0.4.2.tgz",
+      "integrity": "sha512-f7VpLebTdaXs81rg/oj4Vg/ObZy2QtGzAmGLNsqUS5G5KtSN68tFcIsbvNODfNyQxU78g7D8x77o3bgfBTR+2Q==",
       "dev": true,
       "requires": {
         "ansi-escapes": "^4.2.1",
         "chalk": "^2.4.1",
+        "jest-regex-util": "^24.9.0",
         "jest-watcher": "^24.3.0",
         "slash": "^3.0.0",
         "string-length": "^3.1.0",
@@ -9041,12 +8744,12 @@
       },
       "dependencies": {
         "ansi-escapes": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.2.1.tgz",
-          "integrity": "sha512-Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+          "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
           "dev": true,
           "requires": {
-            "type-fest": "^0.5.2"
+            "type-fest": "^0.11.0"
           }
         },
         "ansi-regex": {
@@ -9121,10 +8824,10 @@
         }
       }
     },
-    "js-levenshtein": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
-      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g=="
+    "jetifier": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/jetifier/-/jetifier-1.6.6.tgz",
+      "integrity": "sha512-JNAkmPeB/GS2tCRqUzRPsTOHpGDah7xP18vGJfIjZC+W2sxEHbxgJxetIjIqhjQ3yYbYNEELkM/spKLtwoOSUQ=="
     },
     "js-tokens": {
       "version": "4.0.0",
@@ -9132,9 +8835,9 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -9146,6 +8849,11 @@
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
       "dev": true
     },
+    "jsc-android": {
+      "version": "245459.0.0",
+      "resolved": "https://registry.npmjs.org/jsc-android/-/jsc-android-245459.0.0.tgz",
+      "integrity": "sha512-wkjURqwaB1daNkDi2OYYbsLnIdC/lUM2nPXQKRs5pqEU9chDg435bjvo+LSaHotDENygHQDHe+ntUkkw2gwMtg=="
+    },
     "jsdom": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
@@ -9234,11 +8942,11 @@
       "dev": true
     },
     "json5": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
-      "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
+      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
       "requires": {
-        "minimist": "^1.2.0"
+        "minimist": "^1.2.5"
       }
     },
     "jsonfile": {
@@ -9267,17 +8975,17 @@
       }
     },
     "kefir": {
-      "version": "3.8.6",
-      "resolved": "https://registry.npmjs.org/kefir/-/kefir-3.8.6.tgz",
-      "integrity": "sha512-H/8ZTjmEEme2YL388rgy5fFlz2NM4ZImNI2rJrTsR8og454kpY3lPVv53W9lfevNELfNeYD33gMdIKHL25z7WA==",
-      "requires": {
-        "symbol-observable": "1.0.4"
-      }
+      "version": "3.8.7",
+      "resolved": "https://registry.npmjs.org/kefir/-/kefir-3.8.7.tgz",
+      "integrity": "sha512-F1uMGxGi4x88AuPbu0FBJnOMbYgL4op1pzpD3z4RtjUA6A17oQwum23GiEmNkwTLg8Upm+BODV+FJVaSVqBRIw=="
     },
     "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "requires": {
+        "is-buffer": "^1.1.5"
+      }
     },
     "klaw": {
       "version": "1.3.1",
@@ -9310,8 +9018,15 @@
     "leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "dev": true
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="
+    },
+    "levenary": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
+      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
+      "requires": {
+        "leven": "^3.1.0"
+      }
     },
     "levn": {
       "version": "0.3.0",
@@ -9354,24 +9069,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
-    },
-    "lodash.pad": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz",
-      "integrity": "sha1-QzCUmoM6fI2iLMIPaibE1Z3runA="
-    },
-    "lodash.padend": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz",
-      "integrity": "sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4="
-    },
-    "lodash.padstart": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz",
-      "integrity": "sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs="
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
     },
     "lodash.sortby": {
       "version": "4.7.0",
@@ -9384,106 +9084,243 @@
       "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
       "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
     },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+    "log-symbols": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
       "requires": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
+        "chalk": "^2.0.1"
       }
     },
-    "make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+    "logkitty": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/logkitty/-/logkitty-0.6.1.tgz",
+      "integrity": "sha512-cHuXN8qUZuzX/7kB6VyS7kB4xyD24e8gyHXIFNhIv+fjW3P+jEXNUhj0o/7qWJtv7UZpbnPgUqzu/AZQ8RAqxQ==",
       "requires": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
+        "ansi-fragments": "^0.2.1",
+        "dayjs": "^1.8.15",
+        "yargs": "^12.0.5"
       },
       "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-        }
-      }
-    },
-    "makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
-      "requires": {
-        "tmpl": "1.0.x"
-      }
-    },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
-    "map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
-    },
-    "map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "requires": {
-        "object-visit": "^1.0.0"
-      }
-    },
-    "math-random": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
-      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="
-    },
-    "md5-file": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-3.2.3.tgz",
-      "integrity": "sha512-3Tkp1piAHaworfcCgH0jKbTvj1jWWFgbvh2cXaNCgHwyTCBxxvD1Y04rmfpvdPm1P4oXMOpm6+2H7sr7v9v8Fw==",
-      "requires": {
-        "buffer-alloc": "^1.1.0"
-      }
-    },
-    "mem": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
-      "requires": {
-        "mimic-fn": "^1.0.0"
-      }
-    },
-    "merge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
-      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
-    },
-    "merge-stream": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
-      "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
-      "requires": {
-        "readable-stream": "^2.0.1"
-      }
-    },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "invert-kv": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
+        },
+        "lcid": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+          "requires": {
+            "invert-kv": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "mem": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+          "requires": {
+            "map-age-cleaner": "^0.1.1",
+            "mimic-fn": "^2.0.0",
+            "p-is-promise": "^2.0.0"
+          }
+        },
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+        },
+        "os-locale": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+          "requires": {
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        },
+        "yargs": {
+          "version": "12.0.5",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+          "requires": {
+            "cliui": "^4.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^3.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1 || ^4.0.0",
+            "yargs-parser": "^11.1.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "11.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "requires": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+        }
+      }
+    },
+    "makeerror": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "requires": {
+        "tmpl": "1.0.x"
+      }
+    },
+    "map-age-cleaner": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+      "requires": {
+        "p-defer": "^1.0.0"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "md5-file": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-3.2.3.tgz",
+      "integrity": "sha512-3Tkp1piAHaworfcCgH0jKbTvj1jWWFgbvh2cXaNCgHwyTCBxxvD1Y04rmfpvdPm1P4oXMOpm6+2H7sr7v9v8Fw==",
+      "requires": {
+        "buffer-alloc": "^1.1.0"
+      }
+    },
+    "mem": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "merge-stream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
+      "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
+      "requires": {
+        "readable-stream": "^2.0.1"
+      }
+    },
     "metro": {
-      "version": "0.51.1",
-      "resolved": "https://registry.npmjs.org/metro/-/metro-0.51.1.tgz",
-      "integrity": "sha512-nM0dqn8LQlMjhChl2fzTUq2EWiUebZM7nkesD9vQe47W10bj/tbRLPiIIAxht6SRDbPd/hRA+t39PxLhPSKEKg==",
+      "version": "0.56.4",
+      "resolved": "https://registry.npmjs.org/metro/-/metro-0.56.4.tgz",
+      "integrity": "sha512-Kt3OQJQtQdts0JrKnyGdLpKHDjqYBgIfzvYrvfhmFCkKuZ8aqRlVnvpfjQ4/OBm0Fmm9NyyxbNRD9VIbj7WjnA==",
       "requires": {
         "@babel/core": "^7.0.0",
         "@babel/generator": "^7.0.0",
@@ -9494,7 +9331,7 @@
         "@babel/types": "^7.0.0",
         "absolute-path": "^0.0.0",
         "async": "^2.4.0",
-        "babel-preset-fbjs": "^3.0.1",
+        "babel-preset-fbjs": "^3.1.2",
         "buffer-crc32": "^0.2.13",
         "chalk": "^2.4.1",
         "concat-stream": "^1.6.0",
@@ -9507,24 +9344,26 @@
         "graceful-fs": "^4.1.3",
         "image-size": "^0.6.0",
         "invariant": "^2.2.4",
-        "jest-haste-map": "24.0.0-alpha.6",
-        "jest-worker": "24.0.0-alpha.6",
+        "jest-haste-map": "^24.7.1",
+        "jest-worker": "^24.6.0",
         "json-stable-stringify": "^1.0.1",
         "lodash.throttle": "^4.1.1",
         "merge-stream": "^1.0.1",
-        "metro-babel-transformer": "0.51.1",
-        "metro-cache": "0.51.1",
-        "metro-config": "0.51.1",
-        "metro-core": "0.51.1",
-        "metro-minify-uglify": "0.51.1",
-        "metro-react-native-babel-preset": "0.51.1",
-        "metro-resolver": "0.51.1",
-        "metro-source-map": "0.51.1",
+        "metro-babel-register": "^0.56.4",
+        "metro-babel-transformer": "^0.56.4",
+        "metro-cache": "^0.56.4",
+        "metro-config": "^0.56.4",
+        "metro-core": "^0.56.4",
+        "metro-inspector-proxy": "^0.56.4",
+        "metro-minify-uglify": "^0.56.4",
+        "metro-react-native-babel-preset": "^0.56.4",
+        "metro-resolver": "^0.56.4",
+        "metro-source-map": "^0.56.4",
+        "metro-symbolicate": "^0.56.4",
         "mime-types": "2.1.11",
         "mkdirp": "^0.5.1",
         "node-fetch": "^2.2.0",
         "nullthrows": "^1.1.0",
-        "react-transform-hmr": "^1.0.4",
         "resolve": "^1.5.0",
         "rimraf": "^2.5.4",
         "serialize-error": "^2.1.0",
@@ -9539,9 +9378,9 @@
       },
       "dependencies": {
         "core-js": {
-          "version": "2.6.10",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz",
-          "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA=="
+          "version": "2.6.11",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
         },
         "debug": {
           "version": "2.6.9",
@@ -9566,12 +9405,64 @@
             "ua-parser-js": "^0.7.18"
           }
         },
-        "jest-worker": {
-          "version": "24.0.0-alpha.6",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.0.0-alpha.6.tgz",
-          "integrity": "sha512-iXtH7MR9bjWlNnlnRBcrBRrb4cSVxML96La5vsnmBvDI+mJnkP5uEt6Fgpo5Y8f3z9y2Rd7wuPnKRxqQsiU/dA==",
+        "fs-extra": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz",
+          "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^2.1.0",
+            "klaw": "^1.0.0"
+          }
+        },
+        "jsonfile": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "metro-react-native-babel-preset": {
+          "version": "0.56.4",
+          "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.56.4.tgz",
+          "integrity": "sha512-CzbBDM9Rh6w8s1fq+ZqihAh7DDqUAcfo9pPww25+N/eJ7UK436Q7JdfxwdIPpBwLFn6o6MyYn+uwL9OEWBJarA==",
           "requires": {
-            "merge-stream": "^1.0.1"
+            "@babel/plugin-proposal-class-properties": "^7.0.0",
+            "@babel/plugin-proposal-export-default-from": "^7.0.0",
+            "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
+            "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
+            "@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
+            "@babel/plugin-proposal-optional-chaining": "^7.0.0",
+            "@babel/plugin-syntax-dynamic-import": "^7.0.0",
+            "@babel/plugin-syntax-export-default-from": "^7.0.0",
+            "@babel/plugin-syntax-flow": "^7.2.0",
+            "@babel/plugin-transform-arrow-functions": "^7.0.0",
+            "@babel/plugin-transform-block-scoping": "^7.0.0",
+            "@babel/plugin-transform-classes": "^7.0.0",
+            "@babel/plugin-transform-computed-properties": "^7.0.0",
+            "@babel/plugin-transform-destructuring": "^7.0.0",
+            "@babel/plugin-transform-exponentiation-operator": "^7.0.0",
+            "@babel/plugin-transform-flow-strip-types": "^7.0.0",
+            "@babel/plugin-transform-for-of": "^7.0.0",
+            "@babel/plugin-transform-function-name": "^7.0.0",
+            "@babel/plugin-transform-literals": "^7.0.0",
+            "@babel/plugin-transform-modules-commonjs": "^7.0.0",
+            "@babel/plugin-transform-object-assign": "^7.0.0",
+            "@babel/plugin-transform-parameters": "^7.0.0",
+            "@babel/plugin-transform-react-display-name": "^7.0.0",
+            "@babel/plugin-transform-react-jsx": "^7.0.0",
+            "@babel/plugin-transform-react-jsx-source": "^7.0.0",
+            "@babel/plugin-transform-regenerator": "^7.0.0",
+            "@babel/plugin-transform-runtime": "^7.0.0",
+            "@babel/plugin-transform-shorthand-properties": "^7.0.0",
+            "@babel/plugin-transform-spread": "^7.0.0",
+            "@babel/plugin-transform-sticky-regex": "^7.0.0",
+            "@babel/plugin-transform-template-literals": "^7.0.0",
+            "@babel/plugin-transform-typescript": "^7.0.0",
+            "@babel/plugin-transform-unicode-regex": "^7.0.0",
+            "@babel/template": "^7.0.0",
+            "react-refresh": "^0.4.0"
           }
         },
         "mime-db": {
@@ -9593,36 +9484,16 @@
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         },
         "node-fetch": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-          "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
-        },
-        "yargs": {
-          "version": "9.0.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
-          "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
-          "requires": {
-            "camelcase": "^4.1.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
-            "read-pkg-up": "^2.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^7.0.0"
-          }
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+          "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
         }
       }
     },
     "metro-babel-register": {
-      "version": "0.51.0",
-      "resolved": "https://registry.npmjs.org/metro-babel-register/-/metro-babel-register-0.51.0.tgz",
-      "integrity": "sha512-rhdvHFOZ7/ub019A3+aYs8YeLydb02/FAMsKr2Nz2Jlf6VUxWrMnrcT0NYX16F9TGdi2ulRlJ9dwvUmdhkk+Bw==",
+      "version": "0.56.4",
+      "resolved": "https://registry.npmjs.org/metro-babel-register/-/metro-babel-register-0.56.4.tgz",
+      "integrity": "sha512-Phm6hMluOWYqfykftjJ1jsTpWvbgb49AC/1taxEctxUdRCZlFgZwBleJZAhQYxJD5J+ikFkEbHDzePEXb29KVA==",
       "requires": {
         "@babel/core": "^7.0.0",
         "@babel/plugin-proposal-class-properties": "^7.0.0",
@@ -9639,56 +9510,52 @@
       },
       "dependencies": {
         "core-js": {
-          "version": "2.6.10",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz",
-          "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA=="
+          "version": "2.6.11",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
         }
       }
     },
     "metro-babel-transformer": {
-      "version": "0.51.1",
-      "resolved": "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.51.1.tgz",
-      "integrity": "sha512-+tOnZZzOzufB86ASdfimUEGB1jBKsdsVpPdjNJZkueTFyvYlGqWDQKHM1w9bwKMeM/czPQ48Y6m8Bou6le0X4w==",
+      "version": "0.56.4",
+      "resolved": "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.56.4.tgz",
+      "integrity": "sha512-IOi4ILgZvaX7GCGHBJp79paNVOq5QxhhbyqAdEJgDP8bHfl/OVHoVKSypfrsMSKSiBrqxhIjyc4XjkXsQtkx5g==",
       "requires": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.0.0",
+        "metro-source-map": "^0.56.4"
       }
     },
     "metro-babel7-plugin-react-transform": {
-      "version": "0.51.1",
-      "resolved": "https://registry.npmjs.org/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.51.1.tgz",
-      "integrity": "sha512-wzn4X9KgmAMZ7Bi6v9KxA7dw+AHGL0RODPxU5NDJ3A6d0yERvzfZ3qkzWhz8jbFkVBK12cu5DTho3HBazKQDOw==",
+      "version": "0.54.1",
+      "resolved": "https://registry.npmjs.org/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.54.1.tgz",
+      "integrity": "sha512-jWm5myuMoZAOhoPsa8ItfDxdTcOzKhTTzzhFlbZnRamE7i9qybeMdrZt8KHQpF7i2p/mKzE9Yhf4ouOz5K/jHg==",
+      "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.0.0"
       }
     },
     "metro-cache": {
-      "version": "0.51.1",
-      "resolved": "https://registry.npmjs.org/metro-cache/-/metro-cache-0.51.1.tgz",
-      "integrity": "sha512-0m1+aicsw77LVAehNuTxDpE1c/7Xv/ajRD+UL/lFCWUxnrjSbxVtIKr8l5DxEY11082c1axVRuaV9e436W+eXg==",
+      "version": "0.56.4",
+      "resolved": "https://registry.npmjs.org/metro-cache/-/metro-cache-0.56.4.tgz",
+      "integrity": "sha512-d1hiUSKwtRsuMxUhHVJ3tjK2BbpUlJGvTyMWohK8Wxx+0GbnWRWWFcI4vlCzlZfoK0VtZK2MJEl5t7Du1mIniQ==",
       "requires": {
-        "jest-serializer": "24.0.0-alpha.6",
-        "metro-core": "0.51.1",
+        "jest-serializer": "^24.4.0",
+        "metro-core": "^0.56.4",
         "mkdirp": "^0.5.1",
         "rimraf": "^2.5.4"
-      },
-      "dependencies": {
-        "jest-serializer": {
-          "version": "24.0.0-alpha.6",
-          "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.0.0-alpha.6.tgz",
-          "integrity": "sha512-IPA5T6/GhlE6dedSk7Cd7YfuORnYjN0VD5iJVFn1Q81RJjpj++Hen5kJbKcg547vXsQ1TddV15qOA/zeIfOCLw=="
-        }
       }
     },
     "metro-config": {
-      "version": "0.51.1",
-      "resolved": "https://registry.npmjs.org/metro-config/-/metro-config-0.51.1.tgz",
-      "integrity": "sha512-WCNd0tTI9gb/ubgTqK1+ljZL4b3hsXVinsOAtep4nHiVb6DSDdbO2yXDD2rpYx3NE6hDRMFS9HHg6G0139pAqQ==",
+      "version": "0.56.4",
+      "resolved": "https://registry.npmjs.org/metro-config/-/metro-config-0.56.4.tgz",
+      "integrity": "sha512-O85QDHwWdMn/8ERe13y4a6vbZL0AHyO8atTvL+9BCulLEO+FQBi1iJjr3+ViLa8cf0m5dRftDsa7P47m5euk4A==",
       "requires": {
         "cosmiconfig": "^5.0.5",
-        "metro": "0.51.1",
-        "metro-cache": "0.51.1",
-        "metro-core": "0.51.1",
-        "pretty-format": "24.0.0-alpha.6"
+        "jest-validate": "^24.7.0",
+        "metro": "^0.56.4",
+        "metro-cache": "^0.56.4",
+        "metro-core": "^0.56.4",
+        "pretty-format": "^24.7.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -9697,65 +9564,69 @@
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
         },
         "pretty-format": {
-          "version": "24.0.0-alpha.6",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.0.0-alpha.6.tgz",
-          "integrity": "sha512-zG2m6YJeuzwBFqb5EIdmwYVf30sap+iMRuYNPytOccEXZMAJbPIFGKVJ/U0WjQegmnQbRo9CI7j6j3HtDaifiA==",
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
+          "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
           "requires": {
+            "@jest/types": "^24.9.0",
             "ansi-regex": "^4.0.0",
-            "ansi-styles": "^3.2.0"
+            "ansi-styles": "^3.2.0",
+            "react-is": "^16.8.4"
           }
         }
       }
     },
     "metro-core": {
-      "version": "0.51.1",
-      "resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.51.1.tgz",
-      "integrity": "sha512-sG1yACjdFqmIzZN50HqLTKUMp1oy0AehHhmIuYeIllo1DjX6Y2o3UAT3rGP8U+SAqJGXf/OWzl6VNyRPGDENfA==",
+      "version": "0.56.4",
+      "resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.56.4.tgz",
+      "integrity": "sha512-hMzkBdgPt5Zm9nr/1KtIT+A6H7TNiLVCEGG5OiAXj8gTRsA2yy7wAdQpwy0xbE+zi88t/pLOzXpd3ClG/YxyWg==",
       "requires": {
-        "jest-haste-map": "24.0.0-alpha.6",
+        "jest-haste-map": "^24.7.1",
         "lodash.throttle": "^4.1.1",
-        "metro-resolver": "0.51.1",
+        "metro-resolver": "^0.56.4",
         "wordwrap": "^1.0.0"
       }
     },
-    "metro-memory-fs": {
-      "version": "0.51.1",
-      "resolved": "https://registry.npmjs.org/metro-memory-fs/-/metro-memory-fs-0.51.1.tgz",
-      "integrity": "sha512-dXVUpLPLwfQcYHd1HlqHGVzBsiwvUdT92TDSbdc10152TP+iynHBqLDWbxt0MAtd6c/QXwOuGZZ1IcX3+lv5iw=="
-    },
-    "metro-minify-uglify": {
-      "version": "0.51.1",
-      "resolved": "https://registry.npmjs.org/metro-minify-uglify/-/metro-minify-uglify-0.51.1.tgz",
-      "integrity": "sha512-HAqd/rFrQ6mnbqVAszDXIKTg2rqHlY9Fm8DReakgbkAeyMbF2mH3kEgtesPmTrhajdFk81UZcNSm6wxj1JMgVg==",
+    "metro-inspector-proxy": {
+      "version": "0.56.4",
+      "resolved": "https://registry.npmjs.org/metro-inspector-proxy/-/metro-inspector-proxy-0.56.4.tgz",
+      "integrity": "sha512-E1S3MO25mWKmcLn1UQuCDiS0hf9P2Fwq8sEAX5lBLoZbehepNH+4xJ3xXSY51JX4dozBrE8GGoKL4ll3II40LA==",
       "requires": {
-        "uglify-es": "^3.1.9"
+        "connect": "^3.6.5",
+        "debug": "^2.2.0",
+        "rxjs": "^5.4.3",
+        "ws": "^1.1.5",
+        "yargs": "^9.0.0"
       },
       "dependencies": {
-        "commander": {
-          "version": "2.13.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
-          "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "uglify-es": {
-          "version": "3.3.9",
-          "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
-          "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "requires": {
-            "commander": "~2.13.0",
-            "source-map": "~0.6.1"
+            "ms": "2.0.0"
           }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         }
       }
     },
+    "metro-minify-uglify": {
+      "version": "0.56.4",
+      "resolved": "https://registry.npmjs.org/metro-minify-uglify/-/metro-minify-uglify-0.56.4.tgz",
+      "integrity": "sha512-BHgj7+BKEK2pHvWHUR730bIrsZwl8DPtr49x9L0j2grPZ5/UROWXzEr8VZgIss7fl64t845uu1HXNNyuSj2EhA==",
+      "requires": {
+        "uglify-es": "^3.1.9"
+      }
+    },
     "metro-react-native-babel-preset": {
-      "version": "0.51.1",
-      "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.51.1.tgz",
-      "integrity": "sha512-e9tsYDFhU70gar0jQWcZXRPJVCv4k7tEs6Pm74wXO2OO/T1MEumbvniDIGwGG8bG8RUnYdHhjcaiub2Vc5BRWw==",
+      "version": "0.54.1",
+      "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.54.1.tgz",
+      "integrity": "sha512-Hfr32+u5yYl3qhYQJU8NQ26g4kQlc3yFMg7keVR/3H8rwBIbFqXgsKt8oe0dOrv7WvrMqBHhDtVdU9ls3sSq8g==",
+      "dev": true,
       "requires": {
         "@babel/plugin-proposal-class-properties": "^7.0.0",
         "@babel/plugin-proposal-export-default-from": "^7.0.0",
@@ -9765,6 +9636,7 @@
         "@babel/plugin-proposal-optional-chaining": "^7.0.0",
         "@babel/plugin-syntax-dynamic-import": "^7.0.0",
         "@babel/plugin-syntax-export-default-from": "^7.0.0",
+        "@babel/plugin-syntax-flow": "^7.2.0",
         "@babel/plugin-transform-arrow-functions": "^7.0.0",
         "@babel/plugin-transform-block-scoping": "^7.0.0",
         "@babel/plugin-transform-classes": "^7.0.0",
@@ -9790,41 +9662,26 @@
         "@babel/plugin-transform-typescript": "^7.0.0",
         "@babel/plugin-transform-unicode-regex": "^7.0.0",
         "@babel/template": "^7.0.0",
-        "metro-babel7-plugin-react-transform": "0.51.1",
+        "metro-babel7-plugin-react-transform": "0.54.1",
         "react-transform-hmr": "^1.0.4"
       }
     },
     "metro-react-native-babel-transformer": {
-      "version": "0.51.0",
-      "resolved": "https://registry.npmjs.org/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.51.0.tgz",
-      "integrity": "sha512-VFnqtE0qrVmU1HV9B04o53+NZHvDwR+CWCoEx4+7vCqJ9Tvas741biqCjah9xtifoKdElQELk6x0soOAWCDFJA==",
+      "version": "0.56.4",
+      "resolved": "https://registry.npmjs.org/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.56.4.tgz",
+      "integrity": "sha512-ng74eutuy1nyGI9+TDzzVAVfEmNPDlapV4msTQMKPi4EFqo/fBn7Ct33ME9l5E51pQBBnxt/UwcpTvd13b29kQ==",
       "requires": {
         "@babel/core": "^7.0.0",
-        "babel-preset-fbjs": "^3.0.1",
-        "metro-babel-transformer": "0.51.0",
-        "metro-react-native-babel-preset": "0.51.0"
+        "babel-preset-fbjs": "^3.1.2",
+        "metro-babel-transformer": "^0.56.4",
+        "metro-react-native-babel-preset": "^0.56.4",
+        "metro-source-map": "^0.56.4"
       },
       "dependencies": {
-        "metro-babel-transformer": {
-          "version": "0.51.0",
-          "resolved": "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.51.0.tgz",
-          "integrity": "sha512-M7KEY/hjD3E8tJEliWgI0VOSaJtqaznC0ItM6FiMrhoGDqqa1BvGofl+EPcKqjBSOV1UgExua/T1VOIWbjwQsw==",
-          "requires": {
-            "@babel/core": "^7.0.0"
-          }
-        },
-        "metro-babel7-plugin-react-transform": {
-          "version": "0.51.0",
-          "resolved": "https://registry.npmjs.org/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.51.0.tgz",
-          "integrity": "sha512-dZ95kXcE2FJMoRsYhxr7YLCbOlHWKwe0bOpihRhfImDTgFfuKIzU4ROQwMUbE0NCbzB+ATFsa2FZ3pHDJ5GI0w==",
-          "requires": {
-            "@babel/helper-module-imports": "^7.0.0"
-          }
-        },
         "metro-react-native-babel-preset": {
-          "version": "0.51.0",
-          "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.51.0.tgz",
-          "integrity": "sha512-Y/aPeLl4RzY8IEAneOyDcpdjto/8yjIuX9eUWRngjSqdHYhGQtqiSBpfTpo0BvXpwNRLwCLHyXo58gNpckTJFw==",
+          "version": "0.56.4",
+          "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.56.4.tgz",
+          "integrity": "sha512-CzbBDM9Rh6w8s1fq+ZqihAh7DDqUAcfo9pPww25+N/eJ7UK436Q7JdfxwdIPpBwLFn6o6MyYn+uwL9OEWBJarA==",
           "requires": {
             "@babel/plugin-proposal-class-properties": "^7.0.0",
             "@babel/plugin-proposal-export-default-from": "^7.0.0",
@@ -9834,6 +9691,7 @@
             "@babel/plugin-proposal-optional-chaining": "^7.0.0",
             "@babel/plugin-syntax-dynamic-import": "^7.0.0",
             "@babel/plugin-syntax-export-default-from": "^7.0.0",
+            "@babel/plugin-syntax-flow": "^7.2.0",
             "@babel/plugin-transform-arrow-functions": "^7.0.0",
             "@babel/plugin-transform-block-scoping": "^7.0.0",
             "@babel/plugin-transform-classes": "^7.0.0",
@@ -9859,63 +9717,69 @@
             "@babel/plugin-transform-typescript": "^7.0.0",
             "@babel/plugin-transform-unicode-regex": "^7.0.0",
             "@babel/template": "^7.0.0",
-            "metro-babel7-plugin-react-transform": "0.51.0",
-            "react-transform-hmr": "^1.0.4"
+            "react-refresh": "^0.4.0"
           }
         }
       }
     },
     "metro-resolver": {
-      "version": "0.51.1",
-      "resolved": "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.51.1.tgz",
-      "integrity": "sha512-zmWbD/287NDA/jLPuPV0hne/YMMSG0dljzu21TYMg2lXRLur/zROJHHhyepZvuBHgInXBi4Vhr2wvuSnY39SuA==",
+      "version": "0.56.4",
+      "resolved": "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.56.4.tgz",
+      "integrity": "sha512-Ug4ulVfpkKZ1Wu7mdYj9XLGuOqZTuWCqEhyx3siKTc/2eBwKZQXmiNo5d/IxWNvmwL/87Abeb724I6CMzMfjiQ==",
       "requires": {
         "absolute-path": "^0.0.0"
       }
     },
     "metro-source-map": {
-      "version": "0.51.1",
-      "resolved": "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.51.1.tgz",
-      "integrity": "sha512-JyrE+RV4YumrboHPHTGsUUGERjQ681ImRLrSYDGcmNv4tfpk9nvAK26UAas4IvBYFCC9oW90m0udt3kaQGv59Q==",
+      "version": "0.56.4",
+      "resolved": "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.56.4.tgz",
+      "integrity": "sha512-f1P9/rpFmG3Z0Jatiw2zvLItx1TwR7mXTSDj4qLDCWeVMB3kEXAr3R0ucumTW8c6HfpJljeRBWzYFXF33fd81g==",
+      "requires": {
+        "@babel/traverse": "^7.0.0",
+        "@babel/types": "^7.0.0",
+        "invariant": "^2.2.4",
+        "metro-symbolicate": "^0.56.4",
+        "ob1": "^0.56.4",
+        "source-map": "^0.5.6",
+        "vlq": "^1.0.0"
+      }
+    },
+    "metro-symbolicate": {
+      "version": "0.56.4",
+      "resolved": "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.56.4.tgz",
+      "integrity": "sha512-8mCNNn6zV5FFKCIcRgI7736Xl+owgvYuy8qanPxZN36f7utiWRYeB+PirEBPcglBk4qQvoy2lT6oPULNXZQbbQ==",
       "requires": {
-        "source-map": "^0.5.6"
+        "invariant": "^2.2.4",
+        "metro-source-map": "^0.56.4",
+        "source-map": "^0.5.6",
+        "through2": "^2.0.1",
+        "vlq": "^1.0.0"
       }
     },
     "micromatch": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-      "requires": {
-        "arr-diff": "^2.0.0",
-        "array-unique": "^0.2.1",
-        "braces": "^1.8.2",
-        "expand-brackets": "^0.1.4",
-        "extglob": "^0.3.1",
-        "filename-regex": "^2.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.1",
-        "kind-of": "^3.0.2",
-        "normalize-path": "^2.0.1",
-        "object.omit": "^2.0.0",
-        "parse-glob": "^3.0.4",
-        "regex-cache": "^0.4.2"
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
       },
       "dependencies": {
-        "arr-diff": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-          "requires": {
-            "arr-flatten": "^1.0.1"
-          }
-        },
         "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -9925,16 +9789,16 @@
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
     },
     "mime-db": {
-      "version": "1.40.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
     },
     "mime-types": {
-      "version": "2.1.24",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
       "requires": {
-        "mime-db": "1.40.0"
+        "mime-db": "1.44.0"
       }
     },
     "mimic-fn": {
@@ -9946,6 +9810,7 @@
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
       "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
+      "dev": true,
       "requires": {
         "dom-walk": "^0.1.0"
       }
@@ -9959,14 +9824,14 @@
       }
     },
     "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
     },
     "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "requires": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
@@ -9983,35 +9848,55 @@
       }
     },
     "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
       "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-        }
+        "minimist": "^1.2.5"
+      }
+    },
+    "mobx": {
+      "version": "5.15.4",
+      "resolved": "https://registry.npmjs.org/mobx/-/mobx-5.15.4.tgz",
+      "integrity": "sha512-xRFJxSU2Im3nrGCdjSuOTFmxVDGeqOHL+TyADCGbT0k4HHqGmx5u2yaHNryvoORpI4DfbzjJ5jPmuv+d7sioFw=="
+    },
+    "mobx-persist": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/mobx-persist/-/mobx-persist-0.4.1.tgz",
+      "integrity": "sha512-cPxVuZTY5neesxOV/Z25SF4+/NbC6wfHOe9HT5XoSEkAALNxNE41yDK48peJQ3iK14m0G2ywQRklCXeV3wftnQ==",
+      "requires": {
+        "serializr": "^1.1.11"
+      }
+    },
+    "mobx-react": {
+      "version": "5.4.4",
+      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-5.4.4.tgz",
+      "integrity": "sha512-2mTzpyEjVB/RGk2i6KbcmP4HWcAUFox5ZRCrGvSyz49w20I4C4qql63grPpYrS9E9GKwgydBHQlA4y665LuRCQ==",
+      "requires": {
+        "hoist-non-react-statics": "^3.0.0",
+        "react-lifecycles-compat": "^3.0.2"
       }
     },
+    "mobx-state-tree": {
+      "version": "3.16.0",
+      "resolved": "https://registry.npmjs.org/mobx-state-tree/-/mobx-state-tree-3.16.0.tgz",
+      "integrity": "sha512-3eB3/h611fMNu5tvs7I09Hw9Njd0inJzuJMKaY7l49zbNVV6g1kh/poCu1AHZCA/s91N1rq+2VTv9FPo7wyjdA=="
+    },
     "moment": {
-      "version": "2.24.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
-      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.26.0.tgz",
+      "integrity": "sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw=="
     },
     "morgan": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz",
-      "integrity": "sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
+      "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
       "requires": {
-        "basic-auth": "~2.0.0",
+        "basic-auth": "~2.0.1",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "~2.0.0",
         "on-finished": "~2.3.0",
-        "on-headers": "~1.0.1"
+        "on-headers": "~1.0.2"
       },
       "dependencies": {
         "debug": {
@@ -10022,6 +9907,11 @@
             "ms": "2.0.0"
           }
         },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -10030,9 +9920,9 @@
       }
     },
     "ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "mute-stream": {
       "version": "0.0.7",
@@ -10040,9 +9930,9 @@
       "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
     },
     "nan": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.1.tgz",
-      "integrity": "sha512-I6YB/YEuDeUZMmhscXKxGgZlFnhsn5y0hgOZBadkzfTRrZBtJDZeg6eQf7PYMIEclwmorTKK8GztsyOUSVBREA==",
+      "version": "2.14.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
       "optional": true
     },
     "nanomatch": {
@@ -10073,27 +9963,10 @@
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
           "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
         },
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        },
         "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -10108,12 +9981,6 @@
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
       "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
     },
-    "neo-async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
-      "dev": true
-    },
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -10128,6 +9995,11 @@
         "is-stream": "^1.0.1"
       }
     },
+    "node-git-hooks": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/node-git-hooks/-/node-git-hooks-1.0.1.tgz",
+      "integrity": "sha512-NTuNvQ4pMkOfpeWY+DhxasMak3jYpFp5IWsFKLU80ukuKzvp2uA/BMGxOXDtm0Cew+B65mcpSL6h2UguOIspyA=="
+    },
     "node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -10151,18 +10023,20 @@
       }
     },
     "node-releases": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.11.tgz",
-      "integrity": "sha512-8v1j5KfP+s5WOTa1spNUAOfreajQPN12JXbRR0oDE+YrJBQCXBnNqUDj27EKpPLOoSiU3tKi3xGPB+JaOdUEQQ==",
-      "requires": {
-        "semver": "^5.3.0"
-      }
+      "version": "1.1.58",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz",
+      "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg=="
     },
     "noop-fn": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/noop-fn/-/noop-fn-1.0.0.tgz",
       "integrity": "sha1-XzPUfxPSFQ35PgywNmmemC94/78="
     },
+    "normalize-css-color": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/normalize-css-color/-/normalize-css-color-1.0.2.tgz",
+      "integrity": "sha1-Apkel8zOxmI/5XOvu/Deah8+n40="
+    },
     "normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -10190,16 +10064,6 @@
         "path-key": "^2.0.0"
       }
     },
-    "npmlog": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.4.tgz",
-      "integrity": "sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI=",
-      "requires": {
-        "ansi": "~0.3.1",
-        "are-we-there-yet": "~1.1.2",
-        "gauge": "~1.2.5"
-      }
-    },
     "nullthrows": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz",
@@ -10211,9 +10075,9 @@
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
     "nwsapi": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz",
-      "integrity": "sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
       "dev": true
     },
     "oauth-sign": {
@@ -10222,6 +10086,11 @@
       "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
       "dev": true
     },
+    "ob1": {
+      "version": "0.56.4",
+      "resolved": "https://registry.npmjs.org/ob1/-/ob1-0.56.4.tgz",
+      "integrity": "sha512-URgFof9z2wotiYFsqlydXtQfGV81gvBI2ODy64xfd3vPo+AYom5PVDX4t4zn23t/O+S2IxqApSQM8uJAybmz7w=="
+    },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -10244,27 +10113,19 @@
           "requires": {
             "is-descriptor": "^0.1.0"
           }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
         }
       }
     },
     "object-inspect": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
-      "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
       "dev": true
     },
     "object-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
-      "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
     },
     "object-visit": {
       "version": "1.0.1",
@@ -10293,22 +10154,13 @@
       }
     },
     "object.getownpropertydescriptors": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
-      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
+      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.5.1"
-      }
-    },
-    "object.omit": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-      "requires": {
-        "for-own": "^0.1.4",
-        "is-extendable": "^0.1.1"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
       }
     },
     "object.pick": {
@@ -10355,52 +10207,31 @@
         "mimic-fn": "^1.0.0"
       }
     },
-    "opencollective-postinstall": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz",
-      "integrity": "sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw=="
-    },
-    "opn": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-3.0.3.tgz",
-      "integrity": "sha1-ttmec5n3jWXDuq/+8fsojpuFJDo=",
+    "open": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
+      "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
       "requires": {
-        "object-assign": "^4.0.1"
+        "is-wsl": "^1.1.0"
       }
     },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
-        },
-        "wordwrap": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
-        }
-      }
+    "opencollective-postinstall": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
+      "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q=="
     },
     "optionator": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
       "dev": true,
       "requires": {
         "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
+        "fast-levenshtein": "~2.0.6",
         "levn": "~0.3.0",
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
+        "word-wrap": "~1.2.3"
       }
     },
     "options": {
@@ -10408,6 +10239,34 @@
       "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
       "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8="
     },
+    "ora": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz",
+      "integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==",
+      "requires": {
+        "chalk": "^2.4.2",
+        "cli-cursor": "^2.1.0",
+        "cli-spinners": "^2.0.0",
+        "log-symbols": "^2.2.0",
+        "strip-ansi": "^5.2.0",
+        "wcwidth": "^1.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
     "os-locale": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
@@ -10416,6 +10275,37 @@
         "execa": "^0.7.0",
         "lcid": "^1.0.0",
         "mem": "^1.1.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+          "requires": {
+            "cross-spawn": "^5.0.1",
+            "get-stream": "^3.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
+        }
       }
     },
     "os-tmpdir": {
@@ -10474,17 +10364,6 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
       "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
     },
-    "parse-glob": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-      "requires": {
-        "glob-base": "^0.3.0",
-        "is-dotfile": "^1.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.0"
-      }
-    },
     "parse-json": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
@@ -10516,9 +10395,9 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
     },
     "path-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.0.tgz",
-      "integrity": "sha512-Hkavx/nY4/plImrZPHRk2CL9vpOymZLgEbMNX1U0bjcBL7QN9wODxyx0yaMZURSQaUtSEvDrfAvxa9oPb0at9g=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="
     },
     "path-dirname": {
       "version": "1.0.2",
@@ -10546,9 +10425,9 @@
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
     },
     "path-to-regexp": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
-      "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
+      "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
       "requires": {
         "isarray": "0.0.1"
       },
@@ -10613,9 +10492,9 @@
           }
         },
         "p-limit": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "requires": {
             "p-try": "^2.0.0"
           }
@@ -10674,6 +10553,11 @@
             "array-slice": "^0.2.3"
           }
         },
+        "arr-union": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+          "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0="
+        },
         "extend-shallow": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
@@ -10700,6 +10584,11 @@
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
     },
+    "postcss-value-parser": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
+    },
     "pouchdb-collections": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/pouchdb-collections/-/pouchdb-collections-1.0.1.tgz",
@@ -10711,11 +10600,6 @@
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
       "dev": true
     },
-    "preserve": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks="
-    },
     "pretty-format": {
       "version": "23.6.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz",
@@ -10723,13 +10607,6 @@
       "requires": {
         "ansi-regex": "^3.0.0",
         "ansi-styles": "^3.2.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        }
       }
     },
     "private": {
@@ -10738,14 +10615,15 @@
       "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
     },
     "process": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
-      "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8="
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
     },
     "process-nextick-args": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
     "promise": {
       "version": "7.3.1",
@@ -10756,13 +10634,13 @@
       }
     },
     "prompts": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz",
-      "integrity": "sha512-VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
+      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
       "dev": true,
       "requires": {
         "kleur": "^3.0.3",
-        "sisteransi": "^1.0.3"
+        "sisteransi": "^1.0.4"
       }
     },
     "prop-types": {
@@ -10781,9 +10659,9 @@
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
     "psl": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
-      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true
     },
     "pump": {
@@ -10802,32 +10680,25 @@
       "dev": true
     },
     "qs": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.0.tgz",
-      "integrity": "sha512-27RP4UotQORTpmNQDX8BHPukOnBP3p1uUJY5UnDhaJB+rMt9iMsok724XL+UHU23bEFOHRMQ2ZhI99qOWUMGFA=="
+      "version": "6.9.4",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
+      "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="
     },
-    "querystringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
-      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
-    },
-    "randomatic": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
-      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
+    "query-string": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.13.0.tgz",
+      "integrity": "sha512-KJe8p8EUcixhPCp4cJoTYVfmgKHjnAB/Pq3fiqlmyNHvpHnOL5U4YE7iI2PYivGHp4HFocWz300906BAQX0H7g==",
       "requires": {
-        "is-number": "^4.0.0",
-        "kind-of": "^6.0.0",
-        "math-random": "^1.0.1"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
-        }
+        "decode-uri-component": "^0.2.0",
+        "split-on-first": "^1.0.0",
+        "strict-uri-encode": "^2.0.0"
       }
     },
+    "querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
+    },
     "range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -10844,15 +10715,11 @@
         "scheduler": "^0.13.3"
       }
     },
-    "react-clone-referenced-element": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/react-clone-referenced-element/-/react-clone-referenced-element-1.1.0.tgz",
-      "integrity": "sha512-FKOsfKbBkPxYE8576EM6uAfHC4rnMpLyH6/TJUL4WcHUEB3EUn8AxPjnnV/IiwSSzsClvHYK+sDELKN/EJ0WYg=="
-    },
     "react-deep-force-update": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-1.1.2.tgz",
-      "integrity": "sha512-WUSQJ4P/wWcusaH+zZmbECOk7H5N2pOIl0vzheeornkIMhu+qrNdGFm0bDZLCb0hSF0jf/kH1SgkNGfBdTc4wA=="
+      "integrity": "sha512-WUSQJ4P/wWcusaH+zZmbECOk7H5N2pOIl0vzheeornkIMhu+qrNdGFm0bDZLCb0hSF0jf/kH1SgkNGfBdTc4wA==",
+      "dev": true
     },
     "react-devtools-core": {
       "version": "3.6.3",
@@ -10880,10 +10747,21 @@
         }
       }
     },
+    "react-dom": {
+      "version": "16.8.3",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.3.tgz",
+      "integrity": "sha512-ttMem9yJL4/lpItZAQ2NTFAbV7frotHk5DZEHXUOws2rMmrsvh1Na7ThGT0dTzUIl6pqTOi5tYREfL8AEna3lA==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "scheduler": "^0.13.3"
+      }
+    },
     "react-is": {
-      "version": "16.8.4",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.4.tgz",
-      "integrity": "sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA=="
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
     "react-lifecycles-compat": {
       "version": "3.0.4",
@@ -10891,79 +10769,161 @@
       "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
     },
     "react-native": {
-      "version": "https://github.com/expo/react-native/archive/sdk-35.0.0.tar.gz",
-      "integrity": "sha512-KBH8PlT3K3yTYW/u2E1KKTAaVq2WjYAqZTOgXyosSLwg/TVpG6JbHyTG4a24f5tI2GEqarRLufsggF4CkB7KUw==",
+      "version": "https://github.com/expo/react-native/archive/sdk-36.0.0.tar.gz",
+      "integrity": "sha512-wpsK4vGw8Lr4KI2WmHhbabXafWO5wYAZguCZOB+kLhwR2bCn7W9gvdCfG7fkMKHeQVTm6cmBWYHzarlP0xOqTA==",
       "requires": {
         "@babel/runtime": "^7.0.0",
-        "@react-native-community/cli": "^1.2.1",
-        "absolute-path": "^0.0.0",
+        "@react-native-community/cli": "^3.0.0-alpha.1",
+        "@react-native-community/cli-platform-android": "^3.0.0-alpha.1",
+        "@react-native-community/cli-platform-ios": "^3.0.0-alpha.1",
+        "abort-controller": "^3.0.0",
         "art": "^0.10.0",
         "base64-js": "^1.1.2",
-        "chalk": "^2.4.1",
-        "commander": "^2.9.0",
-        "compression": "^1.7.1",
         "connect": "^3.6.5",
         "create-react-class": "^15.6.3",
-        "debug": "^2.2.0",
-        "denodeify": "^1.2.1",
-        "errorhandler": "^1.5.0",
         "escape-string-regexp": "^1.0.5",
-        "event-target-shim": "^1.0.5",
+        "event-target-shim": "^5.0.1",
         "fbjs": "^1.0.0",
-        "fbjs-scripts": "^1.0.0",
-        "fs-extra": "^1.0.0",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.1.3",
-        "inquirer": "^3.0.6",
+        "fbjs-scripts": "^1.1.0",
+        "hermes-engine": "^0.2.1",
         "invariant": "^2.2.4",
-        "lodash": "^4.17.5",
-        "metro-babel-register": "0.51.0",
-        "metro-react-native-babel-transformer": "0.51.0",
-        "mime": "^1.3.4",
-        "minimist": "^1.2.0",
-        "mkdirp": "^0.5.1",
-        "morgan": "^1.9.0",
-        "node-fetch": "^2.2.0",
-        "node-notifier": "^5.2.1",
-        "npmlog": "^2.0.4",
+        "jsc-android": "^245459.0.0",
+        "metro-babel-register": "^0.56.0",
+        "metro-react-native-babel-transformer": "^0.56.0",
+        "metro-source-map": "^0.56.0",
         "nullthrows": "^1.1.0",
-        "opn": "^3.0.2",
-        "optimist": "^0.6.1",
-        "plist": "^3.0.0",
-        "pretty-format": "24.0.0-alpha.6",
+        "pretty-format": "^24.7.0",
         "promise": "^7.1.1",
-        "prop-types": "^15.5.8",
-        "react-clone-referenced-element": "^1.0.1",
-        "react-devtools-core": "^3.6.0",
-        "regenerator-runtime": "^0.11.0",
-        "rimraf": "^2.5.4",
-        "semver": "^5.0.3",
-        "serve-static": "^1.13.1",
-        "shell-quote": "1.6.1",
-        "stacktrace-parser": "0.1.4",
-        "ws": "^1.1.5",
-        "xmldoc": "^0.4.0",
-        "yargs": "^9.0.0"
+        "prop-types": "^15.7.2",
+        "react-devtools-core": "^3.6.3",
+        "react-refresh": "^0.4.0",
+        "regenerator-runtime": "^0.13.2",
+        "scheduler": "0.15.0",
+        "stacktrace-parser": "^0.1.3",
+        "whatwg-fetch": "^3.0.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.5.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+          "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          },
+          "dependencies": {
+            "chalk": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+              "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+              "requires": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+              }
+            }
+          }
+        },
+        "@react-native-community/cli": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-3.2.1.tgz",
+          "integrity": "sha512-bZ/bfZ+9r1gQSxp6t7+00DcpC6vmbVYSvzUCFM/yo5k8bhsDdcy8aocscIaXXVGG+v9Edri/Q7hH9ks7L18/Rg==",
+          "requires": {
+            "@hapi/joi": "^15.0.3",
+            "@react-native-community/cli-debugger-ui": "^3.0.0",
+            "@react-native-community/cli-tools": "^3.0.0",
+            "@react-native-community/cli-types": "^3.0.0",
+            "chalk": "^2.4.2",
+            "command-exists": "^1.2.8",
+            "commander": "^2.19.0",
+            "compression": "^1.7.1",
+            "connect": "^3.6.5",
+            "cosmiconfig": "^5.1.0",
+            "deepmerge": "^3.2.0",
+            "didyoumean": "^1.2.1",
+            "envinfo": "^7.1.0",
+            "errorhandler": "^1.5.0",
+            "execa": "^1.0.0",
+            "find-up": "^4.1.0",
+            "fs-extra": "^7.0.1",
+            "glob": "^7.1.1",
+            "graceful-fs": "^4.1.3",
+            "inquirer": "^3.0.6",
+            "lodash": "^4.17.5",
+            "metro": "^0.56.0",
+            "metro-config": "^0.56.0",
+            "metro-core": "^0.56.0",
+            "metro-react-native-babel-transformer": "^0.56.0",
+            "minimist": "^1.2.0",
+            "mkdirp": "^0.5.1",
+            "morgan": "^1.9.0",
+            "node-notifier": "^5.2.1",
+            "open": "^6.2.0",
+            "ora": "^3.4.0",
+            "plist": "^3.0.0",
+            "pretty-format": "^25.1.0",
+            "semver": "^6.3.0",
+            "serve-static": "^1.13.1",
+            "shell-quote": "1.6.1",
+            "strip-ansi": "^5.2.0",
+            "sudo-prompt": "^9.0.0",
+            "wcwidth": "^1.0.1",
+            "ws": "^1.1.0"
+          },
+          "dependencies": {
+            "pretty-format": {
+              "version": "25.5.0",
+              "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+              "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
+              "requires": {
+                "@jest/types": "^25.5.0",
+                "ansi-regex": "^5.0.0",
+                "ansi-styles": "^4.0.0",
+                "react-is": "^16.12.0"
+              }
+            }
+          }
+        },
+        "@types/yargs": {
+          "version": "15.0.9",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.9.tgz",
+          "integrity": "sha512-HmU8SeIRhZCWcnRskCs36Q1Q00KBV6Cqh/ora8WN1+22dY07AZdn6Gel8QZ3t26XYPImtcL8WV/eqjhVmMEw4g==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
         },
-        "core-js": {
-          "version": "2.6.10",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz",
-          "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA=="
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
         },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "requires": {
-            "ms": "2.0.0"
+            "color-name": "~1.1.4"
           }
         },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "core-js": {
+          "version": "2.6.11",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
+        },
         "fbjs": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-1.0.0.tgz",
@@ -10979,48 +10939,146 @@
             "ua-parser-js": "^0.7.18"
           }
         },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
         },
-        "node-fetch": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-          "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
         },
         "pretty-format": {
-          "version": "24.0.0-alpha.6",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.0.0-alpha.6.tgz",
-          "integrity": "sha512-zG2m6YJeuzwBFqb5EIdmwYVf30sap+iMRuYNPytOccEXZMAJbPIFGKVJ/U0WjQegmnQbRo9CI7j6j3HtDaifiA==",
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
+          "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
           "requires": {
+            "@jest/types": "^24.9.0",
             "ansi-regex": "^4.0.0",
-            "ansi-styles": "^3.2.0"
+            "ansi-styles": "^3.2.0",
+            "react-is": "^16.8.4"
+          },
+          "dependencies": {
+            "@jest/types": {
+              "version": "24.9.0",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
+              "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+              "requires": {
+                "@types/istanbul-lib-coverage": "^2.0.0",
+                "@types/istanbul-reports": "^1.1.1",
+                "@types/yargs": "^13.0.0"
+              }
+            },
+            "@types/yargs": {
+              "version": "13.0.11",
+              "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+              "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
+              "requires": {
+                "@types/yargs-parser": "*"
+              }
+            },
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+            },
+            "ansi-styles": {
+              "version": "3.2.1",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+              "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+              "requires": {
+                "color-convert": "^1.9.0"
+              }
+            },
+            "color-convert": {
+              "version": "1.9.3",
+              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+              "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+              "requires": {
+                "color-name": "1.1.3"
+              }
+            },
+            "color-name": {
+              "version": "1.1.3",
+              "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+              "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+            }
           }
         },
-        "regenerator-runtime": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+        "scheduler": {
+          "version": "0.15.0",
+          "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.15.0.tgz",
+          "integrity": "sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg==",
+          "requires": {
+            "loose-envify": "^1.1.0",
+            "object-assign": "^4.1.1"
+          }
         },
-        "yargs": {
-          "version": "9.0.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
-          "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "requires": {
-            "camelcase": "^4.1.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
-            "read-pkg-up": "^2.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^7.0.0"
+            "ansi-regex": "^4.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+            }
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "requires": {
+            "has-flag": "^4.0.0"
           }
         }
       }
@@ -11034,23 +11092,19 @@
       }
     },
     "react-native-animatable": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/react-native-animatable/-/react-native-animatable-1.3.2.tgz",
-      "integrity": "sha512-rmah3KQ63ft8DxkzFUwJSuZeq+oSYwldoGF4DTOR5WM2WR5wiWLgBAtrAHlI3Di3by323uOR21s+MlqPcHz2Kw==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/react-native-animatable/-/react-native-animatable-1.3.3.tgz",
+      "integrity": "sha512-2ckIxZQAsvWn25Ho+DK3d1mXIgj7tITkrS4pYDvx96WyOttSvzzFeQnM2od0+FUMzILbdHDsDEqZvnz1DYNQ1w==",
       "requires": {
-        "prop-types": "^15.5.10"
+        "prop-types": "^15.7.2"
       }
     },
-    "react-native-branch": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/react-native-branch/-/react-native-branch-3.0.1.tgz",
-      "integrity": "sha512-vbcYxPZlpF5f39GAEUF8kuGQqCNeD3E6zEdvtOq8oCGZunHXlWlKgAS6dgBKCvsHvXgHuMtpvs39VgOp8DaKig=="
-    },
     "react-native-calendar-picker": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/react-native-calendar-picker/-/react-native-calendar-picker-6.0.0.tgz",
-      "integrity": "sha512-8eKF4O0L9yFWjlrYc1+wPFSftlPQ7qj890JQlaOqezwKPR+r3zHiT9LSwV3SkxELJYl6Xn8aOfXGqekHKaDjZQ==",
+      "version": "6.1.4",
+      "resolved": "https://registry.npmjs.org/react-native-calendar-picker/-/react-native-calendar-picker-6.1.4.tgz",
+      "integrity": "sha512-3XIfyz9t3ff7TkzSdGaGRKwaw9c0DjJck2AcTKDZWpcfjKDfOMaNMBZ/RIrICIY8VNQkie+EQM5N+UUkFWO0pA==",
       "requires": {
+        "node-git-hooks": "^1.0.1",
         "prop-types": "^15.6.0",
         "uuid": "3.2.1"
       },
@@ -11062,6 +11116,14 @@
         }
       }
     },
+    "react-native-circular-action-menu": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/react-native-circular-action-menu/-/react-native-circular-action-menu-0.5.0.tgz",
+      "integrity": "sha512-s9jZj0PQd0sXkP9wWGtAVREINyubsOfPpUzJHqYtNweuEIc6f7XCvb9913rHbxemhCT1EdjBCzeL53KAGbXWQA==",
+      "requires": {
+        "prop-types": "^15.6.1"
+      }
+    },
     "react-native-dialog": {
       "version": "5.6.0",
       "resolved": "https://registry.npmjs.org/react-native-dialog/-/react-native-dialog-5.6.0.tgz",
@@ -11071,47 +11133,41 @@
         "react-native-modal": "^9.0.0"
       }
     },
+    "react-native-dotenv": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/react-native-dotenv/-/react-native-dotenv-0.2.0.tgz",
+      "integrity": "sha1-MRVRy2o1o9z+3mSL3tVcDj7OV50=",
+      "requires": {
+        "babel-plugin-dotenv": "0.1.1"
+      }
+    },
     "react-native-dynamic-search-bar": {
       "version": "0.1.11",
       "resolved": "https://registry.npmjs.org/react-native-dynamic-search-bar/-/react-native-dynamic-search-bar-0.1.11.tgz",
       "integrity": "sha512-7A1XDnrvCAFncjR5jVDzUmiK74jbV0E7mtVB0vMjdTzV+dxzvWNUEqW3zlFH1krjI4tMI3Mz7SLmgZeqjP4MYw=="
     },
     "react-native-elements": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/react-native-elements/-/react-native-elements-1.1.0.tgz",
-      "integrity": "sha512-n1eOL0kUdlH01zX7bn1p7qhYXn7kquqxYQ0oWlxoAck9t5Db/KeK5ViOsAk8seYSvAG6Pe7OxgzRFnMfFhng0Q==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/react-native-elements/-/react-native-elements-1.2.7.tgz",
+      "integrity": "sha512-0S+0R1cbItl15i64qrkWnyMztwpw60d0SUsZGVDKRAMf0Jvq9Clgyh/MzxJx2sr42mbedQP1sg5Et4fZM7Fp1w==",
       "requires": {
+        "@types/react-native-vector-icons": "^6.4.4",
         "color": "^3.1.0",
         "deepmerge": "^3.1.0",
         "hoist-non-react-statics": "^3.1.0",
         "opencollective-postinstall": "^2.0.0",
-        "prop-types": "^15.5.8",
+        "prop-types": "^15.7.2",
         "react-native-ratings": "^6.3.0",
         "react-native-status-bar-height": "^2.2.0"
-      },
-      "dependencies": {
-        "color": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/color/-/color-3.1.1.tgz",
-          "integrity": "sha512-PvUltIXRjehRKPSy89VnDWFKY58xyhTLyxIg21vwQBI6qLwZNPmC8k3C1uytIgFKEpOIzN4y32iPm8231zFHIg==",
-          "requires": {
-            "color-convert": "^1.9.1",
-            "color-string": "^1.5.2"
-          }
-        },
-        "deepmerge": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.2.0.tgz",
-          "integrity": "sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow=="
-        },
-        "hoist-non-react-statics": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
-          "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
-          "requires": {
-            "react-is": "^16.7.0"
-          }
-        }
+      }
+    },
+    "react-native-flash-message": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/react-native-flash-message/-/react-native-flash-message-0.1.15.tgz",
+      "integrity": "sha512-aibvd+rp2JrLEqdkKSvrlSHArgFbOycpxYdqEfWd+h3G6JixMPdbCgvRcHSBVM9M1ZIieY9x3a3NCRC4yd7hVw==",
+      "requires": {
+        "prop-types": "^15.7.2",
+        "react-native-iphone-x-helper": "^1.2.1"
       }
     },
     "react-native-gesture-handler": {
@@ -11122,8 +11178,34 @@
         "hoist-non-react-statics": "^2.3.1",
         "invariant": "^2.2.2",
         "prop-types": "^15.5.10"
+      },
+      "dependencies": {
+        "hoist-non-react-statics": {
+          "version": "2.5.5",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
+          "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
+        }
+      }
+    },
+    "react-native-iphone-x-helper": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.2.1.tgz",
+      "integrity": "sha512-/VbpIEp8tSNNHIvstuA3Swx610whci1Zpc9mqNkqn14DkMbw+ORviln2u0XyHG1kPvvwTNGZY6QpeFwxYaSdbQ=="
+    },
+    "react-native-keyboard-aware-scroll-view": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/react-native-keyboard-aware-scroll-view/-/react-native-keyboard-aware-scroll-view-0.9.1.tgz",
+      "integrity": "sha512-tBZ8rmjELN0F6t5UBp5CW3NYmZXgVnJSzVCssv/OqG2t6kiB+OUTqxNvUP24K+HARX4H+XaW0aEJSFQkQCv6KA==",
+      "requires": {
+        "prop-types": "^15.6.2",
+        "react-native-iphone-x-helper": "^1.0.3"
       }
     },
+    "react-native-media-queries": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/react-native-media-queries/-/react-native-media-queries-0.3.0.tgz",
+      "integrity": "sha1-IdDUPMSRSnrHsRQWJWFNVYNtE/4="
+    },
     "react-native-modal": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/react-native-modal/-/react-native-modal-9.0.0.tgz",
@@ -11134,18 +11216,29 @@
       }
     },
     "react-native-modal-datetime-picker": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/react-native-modal-datetime-picker/-/react-native-modal-datetime-picker-7.4.0.tgz",
-      "integrity": "sha512-lq39cVE2MYktv0usF0k/EwW0gyIvERiYFT9yDXmHIhJFihnR0ZV1kK1Pni4pfLNuqWIWbkb5Y3kzpSKcMzdXSA==",
+      "version": "7.6.1",
+      "resolved": "https://registry.npmjs.org/react-native-modal-datetime-picker/-/react-native-modal-datetime-picker-7.6.1.tgz",
+      "integrity": "sha512-Ovq0p20Tbw6uWGV0VIDcCQ5qTaHxC9gEcYmB2a4fD1ksCSwCil9RJBEhC7VirvplvAGCKOKs3bblaKFmhiOBkg==",
       "requires": {
         "prop-types": "^15.7.2",
-        "react-native-modal": "^9.0.0"
+        "react-native-modal": "^11.0.2"
+      },
+      "dependencies": {
+        "react-native-modal": {
+          "version": "11.5.6",
+          "resolved": "https://registry.npmjs.org/react-native-modal/-/react-native-modal-11.5.6.tgz",
+          "integrity": "sha512-APGNfbvgC4hXbJqcSADu79GLoMKIHUmgR3fDQ7rCGZNBypkStSP8imZ4PKK/OzIZZfjGU9aP49jhMgGbhY9KHA==",
+          "requires": {
+            "prop-types": "^15.6.2",
+            "react-native-animatable": "1.3.3"
+          }
+        }
       }
     },
     "react-native-paper": {
-      "version": "2.15.2",
-      "resolved": "https://registry.npmjs.org/react-native-paper/-/react-native-paper-2.15.2.tgz",
-      "integrity": "sha512-8Qibvbsz7BJR8BxUe9ICxIzsBJYBhnQK5w7kK8/5eXYLFjTArjs017ErE4gIuiALF4eusQO38cN6JBOkW0RLRg==",
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/react-native-paper/-/react-native-paper-2.16.0.tgz",
+      "integrity": "sha512-dNHbVZNi9cfKr5sd/5pPGSJSo7ctnl61wLmRxWwvQ2VyEhDN+YxflvZ/vDZrnyivVWPcFS1nmiGCxABARISsuw==",
       "requires": {
         "@callstack/react-theme-provider": "^1.0.7",
         "color": "^2.0.1",
@@ -11155,36 +11248,13 @@
         "react-native-safe-area-view": "^0.12.0"
       },
       "dependencies": {
-        "create-react-context": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.3.tgz",
-          "integrity": "sha512-CQBmD0+QGgTaxDL3OX1IDXYqjkp2It4RIbcb99jS6AEg27Ga+a9G3JtK6SIu0HBwPLZlmwt9F7UwWA4Bn92Rag==",
-          "requires": {
-            "fbjs": "^0.8.0",
-            "gud": "^1.0.0"
-          }
-        },
-        "hoist-non-react-statics": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
-          "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
-          "requires": {
-            "react-is": "^16.7.0"
-          }
-        },
-        "react-native-safe-area-view": {
-          "version": "0.12.0",
-          "resolved": "https://registry.npmjs.org/react-native-safe-area-view/-/react-native-safe-area-view-0.12.0.tgz",
-          "integrity": "sha512-UrAXmBC4KNR5K2eczIDZgqceWyKsgG9gmWFerHCvoyApfei8ceBB9u/c//PWCpS5Gt8MRLTmX5jPtzdXo2yNqg==",
+        "color": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color/-/color-2.0.1.tgz",
+          "integrity": "sha512-ubUCVVKfT7r2w2D3qtHakj8mbmKms+tThR8gI8zEYCbUBl8/voqFGt3kgBqGwXAopgXybnkuOq+qMYCRrp4cXw==",
           "requires": {
-            "hoist-non-react-statics": "^2.3.1"
-          },
-          "dependencies": {
-            "hoist-non-react-statics": {
-              "version": "2.5.5",
-              "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
-              "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
-            }
+            "color-convert": "^1.9.1",
+            "color-string": "^1.5.2"
           }
         }
       }
@@ -11194,40 +11264,71 @@
       "resolved": "https://registry.npmjs.org/react-native-platform-touchable/-/react-native-platform-touchable-1.1.1.tgz",
       "integrity": "sha1-/eSsxl7qWF0osWTQw3FqQhKaaOQ="
     },
+    "react-native-progress": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/react-native-progress/-/react-native-progress-4.1.2.tgz",
+      "integrity": "sha512-sFHs6k6npWDOyvQoL2NeyOyHb+q1s8iOAOeyzoObN77zkxOAsgJt9FcSJLRq70Mw7qSGNJMFDqCgvYR1huYRwQ==",
+      "requires": {
+        "@react-native-community/art": "^1.1.2",
+        "prop-types": "^15.7.2"
+      }
+    },
+    "react-native-progress-circle": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/react-native-progress-circle/-/react-native-progress-circle-2.1.0.tgz",
+      "integrity": "sha512-VP0s92bgbTMQy4hQzPU4LlGyFj3z5u7i1HYFG8/yzXXfGkX1cxKS4xOlE+OTaObWC99w7Bodi3h8R7En2nQPYw=="
+    },
     "react-native-ratings": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/react-native-ratings/-/react-native-ratings-6.3.1.tgz",
-      "integrity": "sha512-+WEtk4wPvnoN5YbfWcmyM4LpKOlvkrFlpQe0KrqeWBAOkN6OXOZYBtiCh97dCIb8Ovpm7goOEcTf3T1MGCi2LA==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/react-native-ratings/-/react-native-ratings-6.5.0.tgz",
+      "integrity": "sha512-YMcfQ7UQCmXGEc/WPlukHSHs5yvckTwjq5fTRk1FG8gaO7fZCNygEUGPuw4Dbvvp3IlsCUn0bOQd63RYsb7NDQ==",
       "requires": {
         "lodash": "^4.17.4",
         "prop-types": "^15.5.10"
       }
     },
+    "react-native-safe-area-context": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-0.7.3.tgz",
+      "integrity": "sha512-9Uqu1vlXPi+2cKW/CW6OnHxA76mWC4kF3wvlqzq4DY8hn37AeiXtLFs2WkxH4yXQRrnJdP6ivc65Lz+MqwRZAA=="
+    },
     "react-native-safe-area-view": {
-      "version": "0.14.8",
-      "resolved": "https://registry.npmjs.org/react-native-safe-area-view/-/react-native-safe-area-view-0.14.8.tgz",
-      "integrity": "sha512-MtRSIcZNstxv87Jet+UsPhEd1tpGe8cVskDXlP657x6rHpSrbrc+y13ZNXrwAgGNNhqQNX7UJT68ZIq//ZRmvw==",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/react-native-safe-area-view/-/react-native-safe-area-view-0.12.0.tgz",
+      "integrity": "sha512-UrAXmBC4KNR5K2eczIDZgqceWyKsgG9gmWFerHCvoyApfei8ceBB9u/c//PWCpS5Gt8MRLTmX5jPtzdXo2yNqg==",
       "requires": {
         "hoist-non-react-statics": "^2.3.1"
+      },
+      "dependencies": {
+        "hoist-non-react-statics": {
+          "version": "2.5.5",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
+          "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
+        }
       }
     },
     "react-native-screens": {
-      "version": "1.0.0-alpha.22",
-      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-1.0.0-alpha.22.tgz",
-      "integrity": "sha512-kSyAt0AeVU6N7ZonfV6dP6iZF8B7Bce+tk3eujXhzBGsLg0VSLnU7uE9VqJF0xdQrHR91ZjGgVMieo/8df9KTA=="
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-2.8.0.tgz",
+      "integrity": "sha512-fUCIQLZX+5XB0ypWX038P3zso54IFFjTsQUZJWEsjC3pp5rPItAt5SzqtJn+uVjcJaczZ+dpIuvj6IFLqkWLZQ=="
     },
     "react-native-search-bar": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/react-native-search-bar/-/react-native-search-bar-3.4.2.tgz",
-      "integrity": "sha512-hchI0UBeKzNbPchJ4fXhl+o3fu4a9uQEmtRQrtf1lAqtTU3/WEtSHZ9Dz5Ix/ZalZQtiBcqlDVZTfIk3x7DbVw==",
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/react-native-search-bar/-/react-native-search-bar-3.5.1.tgz",
+      "integrity": "sha512-L+y2gQZstApb2DavE8se6Mzj3CgxZiHxM0DezAdT4kb6+kV4+WeTN8jPxvrP6zgwbGcjuYKaHrASKnBmhuWmhA==",
       "requires": {
         "prop-types": "^15.5.10"
       }
     },
     "react-native-status-bar-height": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/react-native-status-bar-height/-/react-native-status-bar-height-2.3.1.tgz",
-      "integrity": "sha512-m9nGKYfFn6ljF1abafzF5cFaD9JCzXwj7kNE9CuF+g0TgtItH70eY2uHaCV9moENTftqd5XIS3Cx0mf4WfistA=="
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/react-native-status-bar-height/-/react-native-status-bar-height-2.5.0.tgz",
+      "integrity": "sha512-sYBCPYA/NapBSHkdm/IVL4ID3LLlIuLqINi2FBDyMkc2BU9pfSGOtkz9yfxoK39mYJuTrlTOQ7mManARUsYDSA=="
+    },
+    "react-native-svg": {
+      "version": "9.9.5",
+      "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-9.9.5.tgz",
+      "integrity": "sha512-nqiPIsC1jB1TUK+ii7ryWc2pDU+YFJojj3awWXOKEP214gfKvjypjvjmW4PCcH70uBLUp3AwaDK2GI/hmbmaoA=="
     },
     "react-native-tab-view": {
       "version": "1.4.1",
@@ -11238,768 +11339,332 @@
       }
     },
     "react-native-vector-icons": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-6.4.2.tgz",
-      "integrity": "sha512-G7Y5HksOQkCanFWKJ+fjwP38XL8tQREOSnw7jrbq28AFrrv41YtafOF4uDSDS7HxMRXs17HeEzn24OzJb63iuA==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-6.6.0.tgz",
+      "integrity": "sha512-MImKVx8JEvVVBnaShMr7/yTX4Y062JZMupht1T+IEgbqBj4aQeQ1z2SH4VHWKNtWtppk4kz9gYyUiMWqx6tNSw==",
       "requires": {
         "lodash": "^4.0.0",
         "prop-types": "^15.6.2",
         "yargs": "^13.2.2"
-      }
-    },
-    "react-native-view-shot": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/react-native-view-shot/-/react-native-view-shot-2.6.0.tgz",
-      "integrity": "sha512-yO9vWi/11m2hEJl8FrW1SMeVzFfPtMKh20MUInGqlsL0H8Ya2JGGlFfrBzx1KiFR2hFb5OdsTLYNtcVZtJ6pLQ=="
-    },
-    "react-navigation": {
-      "version": "3.13.0",
-      "resolved": "https://registry.npmjs.org/react-navigation/-/react-navigation-3.13.0.tgz",
-      "integrity": "sha512-r64bTImY2aNye8wtd39ubouVB6ZMJqjVQYKxH4LFmOav4FsI59fQTDN7sZzyJa29owowYw/wVkh+NWGT+tdD1A==",
-      "requires": {
-        "@react-navigation/core": "~3.5.1",
-        "@react-navigation/native": "~3.6.2",
-        "react-navigation-drawer": "~1.4.0",
-        "react-navigation-stack": "1.5.3",
-        "react-navigation-tabs": "~1.2.0"
-      }
-    },
-    "react-navigation-drawer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/react-navigation-drawer/-/react-navigation-drawer-1.4.0.tgz",
-      "integrity": "sha512-ZyWBozcjB2aZ7vwCALv90cYA2NpDjM+WALaiYRshvPvue8l7cqynePbHK8GhlMGyJDwZqp4MxQmu8u1XAKp3Bw==",
-      "requires": {
-        "react-native-tab-view": "^1.2.0"
-      }
-    },
-    "react-navigation-stack": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/react-navigation-stack/-/react-navigation-stack-1.5.3.tgz",
-      "integrity": "sha512-MQcwDVbZUYsTtDJb5cFOSm+K+e7KpUCoROaGoUOR+JHWE3uuaJ3pd/Nu+32a57J98TNBf4qq0+2TPJWl6z6IBg==",
-      "requires": {
-        "prop-types": "^15.7.2"
-      }
-    },
-    "react-navigation-tabs": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/react-navigation-tabs/-/react-navigation-tabs-1.2.0.tgz",
-      "integrity": "sha512-I6vq3XX4ub9KhWQzcrggznls+2Z2C6w2ro46vokDGGvJ02CBpQRar7J0ETV29Ot5AJY67HucNUmZdH3yDFckmQ==",
-      "requires": {
-        "hoist-non-react-statics": "^2.5.0",
-        "prop-types": "^15.6.1",
-        "react-native-tab-view": "^1.4.1"
-      }
-    },
-    "react-proxy": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/react-proxy/-/react-proxy-1.1.8.tgz",
-      "integrity": "sha1-nb/Z2SdSjDqp9ETkVYw3gwq4wmo=",
-      "requires": {
-        "lodash": "^4.6.1",
-        "react-deep-force-update": "^1.0.0"
-      }
-    },
-    "react-test-renderer": {
-      "version": "16.8.6",
-      "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.8.6.tgz",
-      "integrity": "sha512-H2srzU5IWYT6cZXof6AhUcx/wEyJddQ8l7cLM/F7gDXYyPr4oq+vCIxJYXVGhId1J706sqziAjuOEjyNkfgoEw==",
-      "dev": true,
-      "requires": {
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2",
-        "react-is": "^16.8.6",
-        "scheduler": "^0.13.6"
-      },
-      "dependencies": {
-        "react-is": {
-          "version": "16.11.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.11.0.tgz",
-          "integrity": "sha512-gbBVYR2p8mnriqAwWx9LbuUrShnAuSCNnuPGyc7GJrMVQtPDAh8iLpv7FRuMPFb56KkaVZIYSz1PrjI9q0QPCw==",
-          "dev": true
-        }
-      }
-    },
-    "react-transform-hmr": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/react-transform-hmr/-/react-transform-hmr-1.0.4.tgz",
-      "integrity": "sha1-4aQL0Krvxy6N/Xp82gmvhQZjl7s=",
-      "requires": {
-        "global": "^4.3.0",
-        "react-proxy": "^1.1.7"
-      }
-    },
-    "read-pkg": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-      "requires": {
-        "load-json-file": "^2.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^2.0.0"
-      }
-    },
-    "read-pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-      "requires": {
-        "find-up": "^2.0.0",
-        "read-pkg": "^2.0.0"
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
       },
       "dependencies": {
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
         },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
         },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
           "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
           }
         },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "requires": {
-            "ms": "2.0.0"
+            "locate-path": "^3.0.0"
           }
         },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-              "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
-              }
-            },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
-            }
-          }
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
         },
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          },
-          "dependencies": {
-            "is-extendable": {
-              "version": "1.0.1",
-              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-              "requires": {
-                "is-plain-object": "^2.0.4"
-              }
-            }
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
           }
         },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "p-try": "^2.0.0"
           }
         },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "p-limit": "^2.0.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
         },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
         },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
           }
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
+            "ansi-regex": "^4.1.0"
           }
         },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
           "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
           }
         },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
-    "realpath-native": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz",
-      "integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==",
-      "dev": true,
-      "requires": {
-        "util.promisify": "^1.0.0"
-      }
-    },
-    "regenerate": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
-      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="
-    },
-    "regenerate-unicode-properties": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz",
-      "integrity": "sha512-SbA/iNrBUf6Pv2zU8Ekv1Qbhv92yxL4hiDa2siuxs4KKn4oOoMDHXjAf7+Nz9qinUQ46B1LcWEi/PhJfPWpZWQ==",
-      "requires": {
-        "regenerate": "^1.4.0"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
-    },
-    "regenerator-transform": {
-      "version": "0.13.4",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.4.tgz",
-      "integrity": "sha512-T0QMBjK3J0MtxjPmdIMXm72Wvj2Abb0Bd4HADdfijwMdoIsyQZ6fWC7kDFhk2YinBBEMZDL7Y7wh0J1sGx3S4A==",
-      "requires": {
-        "private": "^0.1.6"
-      }
-    },
-    "regex-cache": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-      "requires": {
-        "is-equal-shallow": "^0.1.3"
-      }
-    },
-    "regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+        "y18n": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
+        },
+        "yargs": {
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
           "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.2"
           }
         },
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+        "yargs-parser": {
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
           "requires": {
-            "is-plain-object": "^2.0.4"
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
           }
         }
       }
     },
-    "regexp-tree": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.5.tgz",
-      "integrity": "sha512-nUmxvfJyAODw+0B13hj8CFVAxhe7fDEAgJgaotBu3nnR+IgGgZq59YedJP5VYTlkEfqjuK6TuRpnymKdatLZfQ=="
-    },
-    "regexpu-core": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz",
-      "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==",
-      "requires": {
-        "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.0.2",
-        "regjsgen": "^0.5.0",
-        "regjsparser": "^0.6.0",
-        "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.1.0"
-      }
-    },
-    "regjsgen": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz",
-      "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA=="
-    },
-    "regjsparser": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz",
-      "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
-      "requires": {
-        "jsesc": "~0.5.0"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
-        }
-      }
-    },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
-    },
-    "repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+    "react-native-view-shot": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/react-native-view-shot/-/react-native-view-shot-3.0.2.tgz",
+      "integrity": "sha512-JZOkGo2jzSX2b7N6N2uDr0wQjSz+QmBtY8jzeo0XJY6bLOfaY5nmWyYxDmDRoSpKiFkGTCkyhUqNnjo6lXOtEw=="
     },
-    "request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-      "dev": true,
+    "react-native-web": {
+      "version": "0.11.7",
+      "resolved": "https://registry.npmjs.org/react-native-web/-/react-native-web-0.11.7.tgz",
+      "integrity": "sha512-w1KAxX2FYLS2GAi3w3BnEZg/IUu7FdgHnLmFKHplRnHMV3u1OPB2EVA7ndNdfu7ds4Rn2OZjSXoNh6F61g3gkA==",
       "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
+        "array-find-index": "^1.0.2",
+        "create-react-class": "^15.6.2",
+        "debounce": "^1.2.0",
+        "deep-assign": "^3.0.0",
+        "fbjs": "^1.0.0",
+        "hyphenate-style-name": "^1.0.2",
+        "inline-style-prefixer": "^5.0.3",
+        "normalize-css-color": "^1.0.2",
+        "prop-types": "^15.6.0",
+        "react-timer-mixin": "^0.13.4"
       },
       "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-          "dev": true
+        "core-js": {
+          "version": "2.6.11",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
         },
-        "tough-cookie": {
-          "version": "2.4.3",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-          "dev": true,
+        "fbjs": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-1.0.0.tgz",
+          "integrity": "sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA==",
           "requires": {
-            "psl": "^1.1.24",
-            "punycode": "^1.4.1"
+            "core-js": "^2.4.1",
+            "fbjs-css-vars": "^1.0.0",
+            "isomorphic-fetch": "^2.1.1",
+            "loose-envify": "^1.0.0",
+            "object-assign": "^4.1.0",
+            "promise": "^7.1.1",
+            "setimmediate": "^1.0.5",
+            "ua-parser-js": "^0.7.18"
           }
         }
       }
     },
-    "request-promise-core": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz",
-      "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==",
-      "dev": true,
+    "react-navigation": {
+      "version": "3.13.0",
+      "resolved": "https://registry.npmjs.org/react-navigation/-/react-navigation-3.13.0.tgz",
+      "integrity": "sha512-r64bTImY2aNye8wtd39ubouVB6ZMJqjVQYKxH4LFmOav4FsI59fQTDN7sZzyJa29owowYw/wVkh+NWGT+tdD1A==",
       "requires": {
-        "lodash": "^4.17.11"
+        "@react-navigation/core": "~3.5.1",
+        "@react-navigation/native": "~3.6.2",
+        "react-navigation-drawer": "~1.4.0",
+        "react-navigation-stack": "1.5.3",
+        "react-navigation-tabs": "~1.2.0"
       }
     },
-    "request-promise-native": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz",
-      "integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==",
-      "dev": true,
+    "react-navigation-drawer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/react-navigation-drawer/-/react-navigation-drawer-1.4.0.tgz",
+      "integrity": "sha512-ZyWBozcjB2aZ7vwCALv90cYA2NpDjM+WALaiYRshvPvue8l7cqynePbHK8GhlMGyJDwZqp4MxQmu8u1XAKp3Bw==",
       "requires": {
-        "request-promise-core": "1.1.2",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
+        "react-native-tab-view": "^1.2.0"
       }
     },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
-    },
-    "require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
-    },
-    "reselect": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
-      "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc="
+    "react-navigation-stack": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/react-navigation-stack/-/react-navigation-stack-1.5.3.tgz",
+      "integrity": "sha512-MQcwDVbZUYsTtDJb5cFOSm+K+e7KpUCoROaGoUOR+JHWE3uuaJ3pd/Nu+32a57J98TNBf4qq0+2TPJWl6z6IBg==",
+      "requires": {
+        "prop-types": "^15.7.2"
+      }
     },
-    "resolve": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
-      "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+    "react-navigation-tabs": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/react-navigation-tabs/-/react-navigation-tabs-1.2.0.tgz",
+      "integrity": "sha512-I6vq3XX4ub9KhWQzcrggznls+2Z2C6w2ro46vokDGGvJ02CBpQRar7J0ETV29Ot5AJY67HucNUmZdH3yDFckmQ==",
       "requires": {
-        "path-parse": "^1.0.6"
+        "hoist-non-react-statics": "^2.5.0",
+        "prop-types": "^15.6.1",
+        "react-native-tab-view": "^1.4.1"
+      },
+      "dependencies": {
+        "hoist-non-react-statics": {
+          "version": "2.5.5",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
+          "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
+        }
       }
     },
-    "resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+    "react-proxy": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/react-proxy/-/react-proxy-1.1.8.tgz",
+      "integrity": "sha1-nb/Z2SdSjDqp9ETkVYw3gwq4wmo=",
       "dev": true,
       "requires": {
-        "resolve-from": "^3.0.0"
+        "lodash": "^4.6.1",
+        "react-deep-force-update": "^1.0.0"
       }
     },
-    "resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
-    },
-    "resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
+    "react-refresh": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz",
+      "integrity": "sha512-Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA=="
     },
-    "restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+    "react-test-renderer": {
+      "version": "16.8.6",
+      "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.8.6.tgz",
+      "integrity": "sha512-H2srzU5IWYT6cZXof6AhUcx/wEyJddQ8l7cLM/F7gDXYyPr4oq+vCIxJYXVGhId1J706sqziAjuOEjyNkfgoEw==",
+      "dev": true,
       "requires": {
-        "onetime": "^2.0.0",
-        "signal-exit": "^3.0.2"
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "react-is": "^16.8.6",
+        "scheduler": "^0.13.6"
       }
     },
-    "ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
+    "react-timer-mixin": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/react-timer-mixin/-/react-timer-mixin-0.13.4.tgz",
+      "integrity": "sha512-4+ow23tp/Tv7hBM5Az5/Be/eKKF7DIvJ09voz5LyHGQaqqz9WV8YMs31eFvcYQs7d451LSg7kDJV70XYN/Ug/Q=="
     },
-    "rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+    "react-transform-hmr": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/react-transform-hmr/-/react-transform-hmr-1.0.4.tgz",
+      "integrity": "sha1-4aQL0Krvxy6N/Xp82gmvhQZjl7s=",
+      "dev": true,
       "requires": {
-        "glob": "^7.1.3"
+        "global": "^4.3.0",
+        "react-proxy": "^1.1.7"
       }
     },
-    "rsvp": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
-      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw=="
-    },
-    "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+    "read-pkg": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
       "requires": {
-        "is-promise": "^2.1.0"
+        "load-json-file": "^2.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^2.0.0"
       }
     },
-    "rx-lite": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
-      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ="
-    },
-    "rx-lite-aggregates": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
-      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
+    "read-pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
       "requires": {
-        "rx-lite": "*"
+        "find-up": "^2.0.0",
+        "read-pkg": "^2.0.0"
       }
     },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+    "readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
       "requires": {
-        "ret": "~0.1.10"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
       }
     },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "sane": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
-      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
-      "dev": true,
+    "readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
       "requires": {
-        "@cnakazawa/watch": "^1.0.3",
-        "anymatch": "^2.0.0",
-        "capture-exit": "^2.0.0",
-        "exec-sh": "^0.3.2",
-        "execa": "^1.0.0",
-        "fb-watchman": "^2.0.0",
-        "micromatch": "^3.1.4",
-        "minimist": "^1.1.1",
-        "walker": "~1.0.5"
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
       },
       "dependencies": {
-        "@cnakazawa/watch": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz",
-          "integrity": "sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==",
-          "dev": true,
-          "requires": {
-            "exec-sh": "^0.3.2",
-            "minimist": "^1.2.0"
-          }
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
         },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
         },
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
           "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
           "requires": {
             "arr-flatten": "^1.1.0",
             "array-unique": "^0.3.2",
@@ -12017,57 +11682,24 @@
               "version": "2.0.1",
               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
               "requires": {
                 "is-extendable": "^0.1.0"
               }
             }
           }
         },
-        "capture-exit": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
-          "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
-          "dev": true,
-          "requires": {
-            "rsvp": "^4.8.4"
-          }
-        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
         },
-        "exec-sh": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz",
-          "integrity": "sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==",
-          "dev": true
-        },
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
         "expand-brackets": {
           "version": "2.1.4",
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
           "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-          "dev": true,
           "requires": {
             "debug": "^2.3.3",
             "define-property": "^0.2.5",
@@ -12082,7 +11714,6 @@
               "version": "0.2.5",
               "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
               "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-              "dev": true,
               "requires": {
                 "is-descriptor": "^0.1.0"
               }
@@ -12091,7 +11722,6 @@
               "version": "2.0.1",
               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
               "requires": {
                 "is-extendable": "^0.1.0"
               }
@@ -12100,7 +11730,6 @@
               "version": "0.1.6",
               "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
               "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-              "dev": true,
               "requires": {
                 "kind-of": "^3.0.2"
               },
@@ -12109,7 +11738,6 @@
                   "version": "3.2.2",
                   "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
                   "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
                   "requires": {
                     "is-buffer": "^1.1.5"
                   }
@@ -12120,7 +11748,6 @@
               "version": "0.1.4",
               "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
               "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-              "dev": true,
               "requires": {
                 "kind-of": "^3.0.2"
               },
@@ -12129,7 +11756,6 @@
                   "version": "3.2.2",
                   "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
                   "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
                   "requires": {
                     "is-buffer": "^1.1.5"
                   }
@@ -12140,7 +11766,6 @@
               "version": "0.1.6",
               "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
               "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-              "dev": true,
               "requires": {
                 "is-accessor-descriptor": "^0.1.6",
                 "is-data-descriptor": "^0.1.4",
@@ -12150,8 +11775,7 @@
             "kind-of": {
               "version": "5.1.0",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
             }
           }
         },
@@ -12159,7 +11783,6 @@
           "version": "2.0.4",
           "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
           "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
           "requires": {
             "array-unique": "^0.3.2",
             "define-property": "^1.0.0",
@@ -12175,7 +11798,6 @@
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
               "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-              "dev": true,
               "requires": {
                 "is-descriptor": "^1.0.0"
               }
@@ -12184,7 +11806,6 @@
               "version": "2.0.1",
               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
               "requires": {
                 "is-extendable": "^0.1.0"
               }
@@ -12195,7 +11816,6 @@
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
           "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
           "requires": {
             "extend-shallow": "^2.0.1",
             "is-number": "^3.0.0",
@@ -12207,27 +11827,16 @@
               "version": "2.0.1",
               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
               "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
               "requires": {
                 "is-extendable": "^0.1.0"
               }
             }
           }
         },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -12236,7 +11845,6 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -12245,7 +11853,6 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -12256,7 +11863,6 @@
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
           },
@@ -12265,7 +11871,6 @@
               "version": "3.2.2",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
               "requires": {
                 "is-buffer": "^1.1.5"
               }
@@ -12275,14 +11880,17 @@
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
           "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
           "requires": {
             "arr-diff": "^4.0.0",
             "array-unique": "^0.3.2",
@@ -12302,21 +11910,297 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "rsvp": {
-          "version": "4.8.5",
-          "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
-          "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "realpath-native": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz",
+      "integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==",
+      "dev": true,
+      "requires": {
+        "util.promisify": "^1.0.0"
+      }
+    },
+    "regenerate": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
+      "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A=="
+    },
+    "regenerate-unicode-properties": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
+      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
+      "requires": {
+        "regenerate": "^1.4.0"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "0.13.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="
+    },
+    "regenerator-transform": {
+      "version": "0.14.4",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz",
+      "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==",
+      "requires": {
+        "@babel/runtime": "^7.8.4",
+        "private": "^0.1.8"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "regexpu-core": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
+      "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
+      "requires": {
+        "regenerate": "^1.4.0",
+        "regenerate-unicode-properties": "^8.2.0",
+        "regjsgen": "^0.5.1",
+        "regjsparser": "^0.6.4",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.2.0"
+      }
+    },
+    "regjsgen": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
+      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="
+    },
+    "regjsparser": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
+      "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
+      "requires": {
+        "jsesc": "~0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
+        }
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
+    },
+    "repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+    },
+    "request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
           "dev": true
         }
       }
     },
+    "request-promise-core": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
+      "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.15"
+      }
+    },
+    "request-promise-native": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz",
+      "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==",
+      "dev": true,
+      "requires": {
+        "request-promise-core": "1.1.3",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+    },
+    "reselect": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
+      "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc="
+    },
+    "resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "requires": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
+    },
+    "rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "rsvp": {
+      "version": "4.8.5",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA=="
+    },
+    "run-async": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="
+    },
+    "rx-lite": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
+      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ="
+    },
+    "rx-lite-aggregates": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
+      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
+      "requires": {
+        "rx-lite": "*"
+      }
+    },
+    "rxjs": {
+      "version": "5.5.12",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
+      "integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
+      "requires": {
+        "symbol-observable": "1.0.1"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "sane": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+      "requires": {
+        "@cnakazawa/watch": "^1.0.3",
+        "anymatch": "^2.0.0",
+        "capture-exit": "^2.0.0",
+        "exec-sh": "^0.3.2",
+        "execa": "^1.0.0",
+        "fb-watchman": "^2.0.0",
+        "micromatch": "^3.1.4",
+        "minimist": "^1.1.1",
+        "walker": "~1.0.5"
+      }
+    },
     "sax": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.6.tgz",
-      "integrity": "sha1-XWFr6KXmB9VOEUr65Vt+ry/MMkA="
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "scheduler": {
       "version": "0.13.6",
@@ -12328,9 +12212,9 @@
       }
     },
     "semver": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
     },
     "send": {
       "version": "0.17.1",
@@ -12366,6 +12250,11 @@
               "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
             }
           }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
         }
       }
     },
@@ -12374,6 +12263,11 @@
       "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz",
       "integrity": "sha1-ULZ51WNc34Rme9yOWa9OW4HV9go="
     },
+    "serializr": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/serializr/-/serializr-1.5.4.tgz",
+      "integrity": "sha512-ImLlkNfNSSv9d7Ah1j/yrPk1FHbRC1zkD7URcgx/8M1eYHGUxGf/Ig/d8ML04ifqN7QesyYKsfLYA4xjAVAR/g=="
+    },
     "serve-static": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
@@ -12391,9 +12285,9 @@
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
     "set-value": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "requires": {
         "extend-shallow": "^2.0.1",
         "is-extendable": "^0.1.1",
@@ -12421,6 +12315,11 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
       "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
     },
+    "shallowequal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
+      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
+    },
     "shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -12451,17 +12350,17 @@
       "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
     },
     "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
     },
     "simple-plist": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.0.0.tgz",
-      "integrity": "sha512-043L2rO80LVF7zfZ+fqhsEkoJFvW8o59rt/l4ctx1TJWoTx7/jkiS1R5TatD15Z1oYnuLJytzE7gcnnBuIPL2g==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.1.1.tgz",
+      "integrity": "sha512-pKMCVKvZbZTsqYR6RKgLfBHkh2cV89GXcA/0CVPje3sOiNOnXA8+rp/ciAMZ7JRaUdLzlEM6JFfUn+fS6Nt3hg==",
       "requires": {
-        "bplist-creator": "0.0.7",
-        "bplist-parser": "0.1.1",
+        "bplist-creator": "0.0.8",
+        "bplist-parser": "0.2.0",
         "plist": "^3.0.1"
       }
     },
@@ -12481,9 +12380,9 @@
       }
     },
     "sisteransi": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz",
-      "integrity": "sha512-SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
       "dev": true
     },
     "slash": {
@@ -12491,6 +12390,16 @@
       "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
       "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="
     },
+    "slice-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+      "requires": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
+        "is-fullwidth-code-point": "^2.0.0"
+      }
+    },
     "slide": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
@@ -12592,9 +12501,9 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         },
         "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -12604,16 +12513,6 @@
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "requires": {
         "kind-of": "^3.2.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
       }
     },
     "source-map": {
@@ -12622,11 +12521,11 @@
       "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
     },
     "source-map-resolve": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
       "requires": {
-        "atob": "^2.1.1",
+        "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
         "resolve-url": "^0.2.1",
         "source-map-url": "^0.4.0",
@@ -12634,9 +12533,9 @@
       }
     },
     "source-map-support": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -12655,32 +12554,32 @@
       "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
     },
     "spdx-correct": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
       "requires": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "spdx-exceptions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
     },
     "spdx-expression-parse": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
       "requires": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
-      "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="
     },
     "split-on-first": {
       "version": "1.1.0",
@@ -12693,25 +12592,6 @@
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "requires": {
         "extend-shallow": "^3.0.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
       }
     },
     "sprintf-js": {
@@ -12739,13 +12619,22 @@
     "stack-utils": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
-      "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==",
-      "dev": true
+      "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA=="
     },
     "stacktrace-parser": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/stacktrace-parser/-/stacktrace-parser-0.1.4.tgz",
-      "integrity": "sha1-ATl5IuX2Ls8whFUiyVxP4dJefU4="
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz",
+      "integrity": "sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg==",
+      "requires": {
+        "type-fest": "^0.7.1"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.7.1.tgz",
+          "integrity": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg=="
+        }
+      }
     },
     "static-extend": {
       "version": "0.1.2",
@@ -12797,12 +12686,6 @@
         "strip-ansi": "^4.0.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -12823,16 +12706,6 @@
         "strip-ansi": "^4.0.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -12843,24 +12716,46 @@
         }
       }
     },
+    "string.prototype.trimend": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
+    },
     "string.prototype.trimleft": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
-      "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
+      "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
-        "function-bind": "^1.1.1"
+        "es-abstract": "^1.17.5",
+        "string.prototype.trimstart": "^1.0.0"
       }
     },
     "string.prototype.trimright": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
-      "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
+      "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
-        "function-bind": "^1.1.1"
+        "es-abstract": "^1.17.5",
+        "string.prototype.trimend": "^1.0.0"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
       }
     },
     "string_decoder": {
@@ -12877,6 +12772,13 @@
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "requires": {
         "ansi-regex": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+        }
       }
     },
     "strip-bom": {
@@ -12889,6 +12791,28 @@
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
     },
+    "styled-components": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.1.1.tgz",
+      "integrity": "sha512-1ps8ZAYu2Husx+Vz8D+MvXwEwvMwFv+hqqUwhNlDN5ybg6A+3xyW1ECrAgywhvXapNfXiz79jJyU0x22z0FFTg==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/traverse": "^7.4.5",
+        "@emotion/is-prop-valid": "^0.8.8",
+        "@emotion/stylis": "^0.8.4",
+        "@emotion/unitless": "^0.7.4",
+        "babel-plugin-styled-components": ">= 1",
+        "css-to-react-native": "^3.0.0",
+        "hoist-non-react-statics": "^3.0.0",
+        "shallowequal": "^1.1.0",
+        "supports-color": "^5.5.0"
+      }
+    },
+    "sudo-prompt": {
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-9.2.1.tgz",
+      "integrity": "sha512-Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw=="
+    },
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -12898,9 +12822,9 @@
       }
     },
     "symbol-observable": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz",
-      "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+      "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ="
     },
     "symbol-tree": {
       "version": "3.2.4",
@@ -12968,9 +12892,9 @@
           }
         },
         "p-limit": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -13088,46 +13012,17 @@
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "requires": {
         "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
       }
     },
     "to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
       }
     },
     "to-regex-range": {
@@ -13146,14 +13041,6 @@
           "requires": {
             "kind-of": "^3.0.2"
           }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
         }
       }
     },
@@ -13181,11 +13068,6 @@
         "punycode": "^2.1.0"
       }
     },
-    "trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
-    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -13211,9 +13093,9 @@
       }
     },
     "type-fest": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz",
-      "integrity": "sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
       "dev": true
     },
     "typedarray": {
@@ -13222,27 +13104,28 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
     },
     "ua-parser-js": {
-      "version": "0.7.19",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.19.tgz",
-      "integrity": "sha512-T3PVJ6uz8i0HzPxOF9SWzWAlfN/DavlpQqepn22xgve/5QecC+XMCAtmUNnY7C9StehaV6exjUCI801lOI7QlQ=="
-    },
-    "uglify-js": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.4.tgz",
-      "integrity": "sha512-9Yc2i881pF4BPGhjteCXQNaXx1DCwm3dtOyBaG2hitHjLWOczw/ki8vD1bqyT3u6K0Ms/FpCShkmfg+FtlOfYA==",
-      "dev": true,
-      "optional": true,
+      "version": "0.7.21",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz",
+      "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ=="
+    },
+    "uglify-es": {
+      "version": "3.3.9",
+      "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
+      "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
       "requires": {
-        "commander": "~2.20.3",
+        "commander": "~2.13.0",
         "source-map": "~0.6.1"
       },
       "dependencies": {
+        "commander": {
+          "version": "2.13.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
+          "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA=="
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
@@ -13266,100 +13149,74 @@
       }
     },
     "unicode-match-property-value-ecmascript": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
+      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ=="
     },
     "unicode-property-aliases-ecmascript": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
-      "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
+      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="
     },
     "unimodules-barcode-scanner-interface": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unimodules-barcode-scanner-interface/-/unimodules-barcode-scanner-interface-4.0.0.tgz",
-      "integrity": "sha512-XAW+8s7w/dQ514I/SPfBKHPmbaCOEpYAkdn1aaBoWocVfdvOKf8SqwHSIaP2W/SFUwWNRF4Wqv2HBt1dvuhSSg=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unimodules-barcode-scanner-interface/-/unimodules-barcode-scanner-interface-5.0.0.tgz",
+      "integrity": "sha512-8irSCD2UOxojD+3KzrsoGe/TlNOF4NQuCtlhCY5PjDU3SoBAZzSmlLfkz6nYs4iovNila0FZu4vE6msm9Ehdtw=="
     },
     "unimodules-camera-interface": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unimodules-camera-interface/-/unimodules-camera-interface-4.0.0.tgz",
-      "integrity": "sha512-rEYD3mKarxzgiWWL8J0mPAxzV4i1WI9DsNMRxyV2T7qC/WWIucroZX72O1BkYjUbIKerGmJWeGYbWHheP4/rsA=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unimodules-camera-interface/-/unimodules-camera-interface-5.0.0.tgz",
+      "integrity": "sha512-fe1Q1RZ6daKLtT5M87HdznBAV9qEsuHdPZVUWsLfizCXrHwCcRWErwb4RZoJC20Y11sj+kkLlE4W5fBJDn6/WA=="
     },
     "unimodules-constants-interface": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unimodules-constants-interface/-/unimodules-constants-interface-4.0.0.tgz",
-      "integrity": "sha512-FTM64GP+uawURWhuExrsCMebpcu0DdREUCuUmes5qd3/uTM2gqmhbm/ZwSKviH/ar4h630Fdb6P6v9o4MDInbA=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unimodules-constants-interface/-/unimodules-constants-interface-5.0.0.tgz",
+      "integrity": "sha512-s7Fwe3MV6BCj+Sexwfrj9mLAzJlhMfOd/ZM9PNZG10nlTRw8uDxQq0VH1m8NuJqV1Ma2BUmQM7H3lBPe4EysYg=="
     },
     "unimodules-face-detector-interface": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unimodules-face-detector-interface/-/unimodules-face-detector-interface-4.0.0.tgz",
-      "integrity": "sha512-ZFzqcNnJkBxvfdKCupvtQUj1yVJkzKivPGV6nydKZc9eJRLUgSXCUWtvXd0vaet1NSQqr2R3r6Ilvj0DzuCzUA=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unimodules-face-detector-interface/-/unimodules-face-detector-interface-5.0.0.tgz",
+      "integrity": "sha512-6VrjHPu429tI54TrGZDQCNIdIXplSwmnJ4jsoVwpubluK+Z4pTRxbEuR3hKelGsvQCUzA38TDD94w7pGMwpe3A=="
     },
     "unimodules-file-system-interface": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unimodules-file-system-interface/-/unimodules-file-system-interface-4.0.0.tgz",
-      "integrity": "sha512-dDcKjArDwY3CXLlCL8tf9/JJG25K2lgtAL+560kqrftLu3pi0x5V7JmSDz52pJ4pLd5xL8s1Rzse+rIr5OpM3g=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unimodules-file-system-interface/-/unimodules-file-system-interface-5.0.0.tgz",
+      "integrity": "sha512-3MRHOigD39geBA6opGkWBoi6nSbFnAr6OWNWiCNN3z1KyFEgeGUFJtTUhzZ/gjsipHubwcWgWBlBSSZKIA7qPQ=="
     },
     "unimodules-font-interface": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unimodules-font-interface/-/unimodules-font-interface-4.0.0.tgz",
-      "integrity": "sha512-RFD1H405kZy8oYcg7f9Krr+UTUn6EZTcqAb+wRL6Ex9TJmzmxJT6JZ0FsUMezOUEwrdvXRpArH4P1AadHlzzGA=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unimodules-font-interface/-/unimodules-font-interface-5.0.0.tgz",
+      "integrity": "sha512-S7S5JcOzqpEEt7fmqBkTkps5pg5InQRiu0KBv8txgQ6ZkW/OYjt4j5/fb6IkLB5RWEdm7Ji/xxmJLafRSj2bjA=="
     },
     "unimodules-image-loader-interface": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unimodules-image-loader-interface/-/unimodules-image-loader-interface-4.0.0.tgz",
-      "integrity": "sha512-tv7g1YmZq9ZnG/x9l3qSlpEn93ZuMD+FuQpOZj3/oGDkBlc27vtBSEi8lTySWb9U7UK+bNlHGFqf1lGZcFU1Ug=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unimodules-image-loader-interface/-/unimodules-image-loader-interface-5.0.0.tgz",
+      "integrity": "sha512-HzT+eqp1jgm9/KiJfAlb5p4rykQlMMo6eI4S626vRtFcywCr6yKN7y5vYT5jmSxR2QIWY/jLGrX4DSt9dCbYbg=="
     },
     "unimodules-permissions-interface": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unimodules-permissions-interface/-/unimodules-permissions-interface-4.0.0.tgz",
-      "integrity": "sha512-bVZ6JQMO12WvAv6YqcHaPV5KekV7WH606eRiMJq5Qwm2z9yGSM+KaOxOH/n2LVcYckForphsCLf58OGVUtM65Q=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unimodules-permissions-interface/-/unimodules-permissions-interface-5.0.0.tgz",
+      "integrity": "sha512-ULtTRsGPSkXm1dELq0Eoq7RCReDYhu71NH2iWnnhmg8MZLykBInHw0bgcd0Fe7IYlRK3VXy8elldAIpFf3OKdw=="
     },
     "unimodules-sensors-interface": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unimodules-sensors-interface/-/unimodules-sensors-interface-4.0.0.tgz",
-      "integrity": "sha512-O7l+N2DLwviTc6gz/ptV7a930Sdo30AvzQLEJPHfqj4e9fCdbrHNrcPqiq0CLqHYYIsdpSDpC6wCWmepLaAgJQ=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unimodules-sensors-interface/-/unimodules-sensors-interface-5.0.0.tgz",
+      "integrity": "sha512-ilmeamfmbADXgq595VpJd+5tJLebfbwqMgwVxQ6/EX1niJkHgRk9iloYqx5QRKXwscwbGepIWXjMIv1/DNShQQ=="
     },
     "unimodules-task-manager-interface": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unimodules-task-manager-interface/-/unimodules-task-manager-interface-4.0.0.tgz",
-      "integrity": "sha512-c7x5hgEtT+oIVd37TBn2jxlTw2+Bgb55XZ2Md0AV5NCjeRlKw2bIBPwUvSdI1iAziSQOIGOImNaaIUo3L3zW3w=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unimodules-task-manager-interface/-/unimodules-task-manager-interface-5.0.0.tgz",
+      "integrity": "sha512-t5M4sgZBl3i6iUO8PAzjD90bh5RyAdQfLf1GqSVsV8BJVEr1uKokGm6t7lq3E+PCC41ulpeiVApdXPImJywJdg=="
     },
     "union-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
-      },
-      "dependencies": {
-        "arr-union": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-          "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
-          }
-        }
+        "set-value": "^2.0.1"
       }
     },
     "universalify": {
@@ -13414,9 +13271,9 @@
       }
     },
     "upath": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
-      "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
     },
     "uri-js": {
       "version": "4.2.2",
@@ -13452,13 +13309,15 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "util.promisify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.2",
+        "has-symbols": "^1.0.1",
+        "object.getownpropertydescriptors": "^2.1.0"
       }
     },
     "utils-merge": {
@@ -13467,9 +13326,9 @@
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uuid": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
     },
     "uuid-js": {
       "version": "0.7.5",
@@ -13501,13 +13360,18 @@
         "extsprintf": "^1.2.0"
       }
     },
-    "w3c-hr-time": {
+    "vlq": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
-      "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=",
+      "resolved": "https://registry.npmjs.org/vlq/-/vlq-1.0.1.tgz",
+      "integrity": "sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w=="
+    },
+    "w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
       "dev": true,
       "requires": {
-        "browser-process-hrtime": "^0.1.2"
+        "browser-process-hrtime": "^1.0.0"
       }
     },
     "walker": {
@@ -13518,13 +13382,12 @@
         "makeerror": "1.0.x"
       }
     },
-    "watch": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/watch/-/watch-0.18.0.tgz",
-      "integrity": "sha1-KAlUdsbffJDJYxOJkMClQj60uYY=",
+    "wcwidth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
       "requires": {
-        "exec-sh": "^0.2.0",
-        "minimist": "^1.2.0"
+        "defaults": "^1.0.3"
       }
     },
     "webidl-conversions": {
@@ -13543,9 +13406,9 @@
       }
     },
     "whatwg-fetch": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz",
-      "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
+      "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
     },
     "whatwg-mimetype": {
       "version": "2.3.0",
@@ -13577,6 +13440,12 @@
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
     },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    },
     "wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
@@ -13591,6 +13460,14 @@
         "strip-ansi": "^3.0.1"
       },
       "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
         "string-width": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -13628,9 +13505,9 @@
       }
     },
     "xcode": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/xcode/-/xcode-2.0.0.tgz",
-      "integrity": "sha512-5xF6RCjAdDEiEsbbZaS/gBRt3jZ/177otZcpoLCjGN/u1LrfgH7/Sgeeavpr/jELpyDqN2im3AKosl2G2W8hfw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/xcode/-/xcode-2.1.0.tgz",
+      "integrity": "sha512-uCrmPITrqTEzhn0TtT57fJaNaw8YJs1aCzs+P/QqxsDbvPZSv7XMPPwXrKvHtD6pLjBM/NaVwraWJm8q83Y4iQ==",
       "requires": {
         "simple-plist": "^1.0.0",
         "uuid": "^3.3.2"
@@ -13648,17 +13525,17 @@
       "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
     },
     "xmldoc": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/xmldoc/-/xmldoc-0.4.0.tgz",
-      "integrity": "sha1-0lciS+g5PqrL+DfvIn/Y7CWzaIg=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/xmldoc/-/xmldoc-1.1.2.tgz",
+      "integrity": "sha512-ruPC/fyPNck2BD1dpz0AZZyrEwMOrWTO5lDdIXS91rs3wtm4j+T8Rp2o+zoOYkkAxJTZRPOSnOGei1egoRmKMQ==",
       "requires": {
-        "sax": "~1.1.1"
+        "sax": "^1.2.1"
       }
     },
     "xmldom": {
-      "version": "0.1.27",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
-      "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
+      "version": "0.1.31",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
+      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="
     },
     "xpipe": {
       "version": "1.0.5",
@@ -13681,214 +13558,23 @@
       "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
     },
     "yargs": {
-      "version": "13.2.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.2.tgz",
-      "integrity": "sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==",
-      "requires": {
-        "cliui": "^4.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
-        "os-locale": "^3.1.0",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
+      "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
+      "requires": {
+        "camelcase": "^4.1.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^2.0.0",
+        "read-pkg-up": "^2.0.0",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
+        "require-main-filename": "^1.0.1",
         "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
+        "string-width": "^2.0.0",
         "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-        },
-        "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-          "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-              "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-              "requires": {
-                "is-fullwidth-code-point": "^2.0.0",
-                "strip-ansi": "^4.0.0"
-              }
-            }
-          }
-        },
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "get-caller-file": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "invert-kv": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "lcid": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-          "requires": {
-            "invert-kv": "^2.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "mem": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-          "requires": {
-            "map-age-cleaner": "^0.1.1",
-            "mimic-fn": "^2.0.0",
-            "p-is-promise": "^2.0.0"
-          }
-        },
-        "mimic-fn": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-        },
-        "os-locale": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
-          "requires": {
-            "execa": "^1.0.0",
-            "lcid": "^2.0.0",
-            "mem": "^4.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-        },
-        "require-main-filename": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "4.1.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
-            },
-            "strip-ansi": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-              "requires": {
-                "ansi-regex": "^4.1.0"
-              }
-            }
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        },
-        "y18n": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
-        },
-        "yargs-parser": {
-          "version": "13.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz",
-          "integrity": "sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==",
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
-        }
+        "y18n": "^3.2.1",
+        "yargs-parser": "^7.0.0"
       }
     },
     "yargs-parser": {
diff --git a/package.json b/package.json
index 6699498b7..79a83e93e 100644
--- a/package.json
+++ b/package.json
@@ -13,27 +13,49 @@
   "dependencies": {
     "@expo/samples": "2.1.1",
     "@expo/vector-icons": "^10.0.0",
-    "expo": "^35.0.0",
-    "expo-camera": "~7.0.0",
-    "expo-sqlite": "^7.0.0",
+    "expo": "^36.0.0",
+    "expo-camera": "~8.0.0",
+    "expo-constants": "~8.0.0",
+    "expo-file-system": "~8.0.0",
+    "expo-sqlite": "^8.0.0",
+    "mobx": "^5.5.0",
+    "mobx-persist": "^0.4.1",
+    "mobx-react": "^5.2.8",
+    "mobx-state-tree": "^3.5.0",
     "moment": "^2.24.0",
     "react": "16.8.3",
-    "react-native": "https://github.com/expo/react-native/archive/sdk-35.0.0.tar.gz",
+    "react-dom": "16.8.3",
+    "react-native": "https://github.com/expo/react-native/archive/sdk-36.0.0.tar.gz",
     "react-native-action-button": "^2.8.5",
     "react-native-calendar-picker": "^6.0.0",
+    "react-native-circular-action-menu": "^0.5.0",
     "react-native-dialog": "^5.6.0",
+    "react-native-dotenv": "^0.2.0",
     "react-native-dynamic-search-bar": "^0.1.11",
     "react-native-elements": "^1.1.0",
-    "react-native-gesture-handler": "~1.3.0",
+    "react-native-flash-message": "^0.1.15",
+    "react-native-gesture-handler": "~1.5.0",
+    "react-native-keyboard-aware-scroll-view": "^0.9.1",
+    "react-native-media-queries": "^0.3.0",
     "react-native-modal-datetime-picker": "^7.4.0",
     "react-native-paper": "^2.15.2",
+    "react-native-progress": "^4.1.2",
+    "react-native-progress-circle": "^2.1.0",
+    "react-native-safe-area-context": "^0.7.3",
+    "react-native-screens": "^2.8.0",
     "react-native-search-bar": "^3.4.2",
+    "react-native-svg": "9.13.3",
     "react-native-vector-icons": "^6.4.2",
-    "react-navigation": "^3.0.9"
+    "react-native-web": "^0.11.7",
+    "react-navigation": "^3.0.9",
+    "styled-components": "^5.0.1"
   },
   "devDependencies": {
     "babel-preset-expo": "^7.0.0",
-    "jest-expo": "^35.0.0"
+    "jest-expo": "^35.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.1.0",
+    "@babel/plugin-proposal-decorators": "^7.1.2"
   },
   "private": true
 }
+
diff --git a/src/analytics/analytics.json b/src/analytics/analytics.json
new file mode 100644
index 000000000..0637a088a
--- /dev/null
+++ b/src/analytics/analytics.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/src/analytics/analyticsManager.js b/src/analytics/analyticsManager.js
new file mode 100644
index 000000000..8f7b00fc4
--- /dev/null
+++ b/src/analytics/analyticsManager.js
@@ -0,0 +1,23 @@
+import gamificationState from "../manager/buddyManager/LoggingStore";
+
+
+export default class analyticsManager{
+
+    static initializeAnalytics(email){
+        this.email = email;
+    }
+    static addLog(componentName, additionalInfo = ""){
+        var newlog = {}
+        newlog.userId = this.email;
+        newlog.additionalInfo = additionalInfo;
+        newlog.componentName = componentName;
+        newlog.date = new Date();
+        newlog.gestureType = "Click";
+        newlog.gamification = gamificationState.gamificationFlag;
+        //var analytics = require('./analytics.json');
+        //analytics.push(newlog);
+        //var fs  = require('fs');
+        console.log("newlog: ", newlog);
+        //fs.writeFile('./analytics.json', JSON.stringify(analytics));
+    }
+}
\ No newline at end of file
diff --git a/src/analytics/analyticsconfig.json b/src/analytics/analyticsconfig.json
new file mode 100644
index 000000000..b2200fdff
--- /dev/null
+++ b/src/analytics/analyticsconfig.json
@@ -0,0 +1,3 @@
+{
+    "backendurl": "localhost:8080"
+}
\ No newline at end of file
diff --git a/src/assets/images/GIP_icon.png b/src/assets/images/GIP_icon.png
new file mode 100644
index 000000000..3093c5c6c
Binary files /dev/null and b/src/assets/images/GIP_icon.png differ
diff --git a/src/assets/images/SymptomTracker/cloating.png b/src/assets/images/SymptomTracker/bloating.png
similarity index 100%
rename from src/assets/images/SymptomTracker/cloating.png
rename to src/assets/images/SymptomTracker/bloating.png
diff --git a/src/assets/images/SymptomTracker/craving.png b/src/assets/images/SymptomTracker/craving.png
new file mode 100644
index 000000000..8f5ee058d
Binary files /dev/null and b/src/assets/images/SymptomTracker/craving.png differ
diff --git a/src/assets/images/SymptomTracker/hungerPain.png b/src/assets/images/SymptomTracker/hungerPain.png
new file mode 100644
index 000000000..9797af286
Binary files /dev/null and b/src/assets/images/SymptomTracker/hungerPain.png differ
diff --git a/src/assets/images/SymptomTracker/lossOfAppetite.png b/src/assets/images/SymptomTracker/lossOfAppetite.png
new file mode 100644
index 000000000..767e95759
Binary files /dev/null and b/src/assets/images/SymptomTracker/lossOfAppetite.png differ
diff --git a/src/assets/images/SymptomTracker/lossOfAppetite_alt.png b/src/assets/images/SymptomTracker/lossOfAppetite_alt.png
new file mode 100644
index 000000000..18f530e7b
Binary files /dev/null and b/src/assets/images/SymptomTracker/lossOfAppetite_alt.png differ
diff --git a/src/assets/images/SymptomTracker/stomachRumble.png b/src/assets/images/SymptomTracker/stomachRumble.png
new file mode 100644
index 000000000..09f91b33b
Binary files /dev/null and b/src/assets/images/SymptomTracker/stomachRumble.png differ
diff --git a/src/assets/images/SymptomTracker/tenesmus.png b/src/assets/images/SymptomTracker/tenesmus.png
new file mode 100644
index 000000000..97c36099e
Binary files /dev/null and b/src/assets/images/SymptomTracker/tenesmus.png differ
diff --git a/src/assets/images/SymptomTracker/tired.png b/src/assets/images/SymptomTracker/tired.png
new file mode 100644
index 000000000..590951b0a
Binary files /dev/null and b/src/assets/images/SymptomTracker/tired.png differ
diff --git a/src/assets/images/SymptomTracker/vomiting.png b/src/assets/images/SymptomTracker/vomiting.png
index 94077ead4..5793f5777 100644
Binary files a/src/assets/images/SymptomTracker/vomiting.png and b/src/assets/images/SymptomTracker/vomiting.png differ
diff --git a/src/assets/images/SymptomTracker/vomiting_alt.png b/src/assets/images/SymptomTracker/vomiting_alt.png
new file mode 100644
index 000000000..94077ead4
Binary files /dev/null and b/src/assets/images/SymptomTracker/vomiting_alt.png differ
diff --git a/src/assets/images/avatar_menu/checkroom-24px.png b/src/assets/images/avatar_menu/checkroom-24px.png
new file mode 100644
index 000000000..ed9309303
Binary files /dev/null and b/src/assets/images/avatar_menu/checkroom-24px.png differ
diff --git a/src/assets/images/avatar_menu/checkroom-24px.svg b/src/assets/images/avatar_menu/checkroom-24px.svg
new file mode 100644
index 000000000..1859263ae
--- /dev/null
+++ b/src/assets/images/avatar_menu/checkroom-24px.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24" viewBox="0 0 24 24" width="24"><g><rect fill="none" height="24" width="24"/><path d="M21.6,18.2L13,11.75v-0.91c1.65-0.49,2.8-2.17,2.43-4.05c-0.26-1.31-1.3-2.4-2.61-2.7C10.54,3.57,8.5,5.3,8.5,7.5h2 C10.5,6.67,11.17,6,12,6s1.5,0.67,1.5,1.5c0,0.84-0.69,1.52-1.53,1.5C11.43,8.99,11,9.45,11,9.99v1.76L2.4,18.2 C1.63,18.78,2.04,20,3,20h9h9C21.96,20,22.37,18.78,21.6,18.2z M6,18l6-4.5l6,4.5H6z"/></g></svg>
\ No newline at end of file
diff --git a/src/assets/images/avatar_menu/emoji_events-24px.png b/src/assets/images/avatar_menu/emoji_events-24px.png
new file mode 100644
index 000000000..9cd1ad662
Binary files /dev/null and b/src/assets/images/avatar_menu/emoji_events-24px.png differ
diff --git a/src/assets/images/avatar_menu/emoji_events-24px.svg b/src/assets/images/avatar_menu/emoji_events-24px.svg
new file mode 100644
index 000000000..8ff976967
--- /dev/null
+++ b/src/assets/images/avatar_menu/emoji_events-24px.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24" viewBox="0 0 24 24" width="24"><rect fill="none" height="24" width="24"/><path d="M19,5h-2V3H7v2H5C3.9,5,3,5.9,3,7v1c0,2.55,1.92,4.63,4.39,4.94c0.63,1.5,1.98,2.63,3.61,2.96V19H7v2h10v-2h-4v-3.1 c1.63-0.33,2.98-1.46,3.61-2.96C19.08,12.63,21,10.55,21,8V7C21,5.9,20.1,5,19,5z M5,8V7h2v3.82C5.84,10.4,5,9.3,5,8z M19,8 c0,1.3-0.84,2.4-2,2.82V7h2V8z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/avatar_menu/flag-24px.svg b/src/assets/images/avatar_menu/flag-24px.svg
new file mode 100644
index 000000000..e9cda1e1d
--- /dev/null
+++ b/src/assets/images/avatar_menu/flag-24px.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M14.4 6L14 4H5v17h2v-7h5.6l.4 2h7V6z"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/avatar_menu/landscape_background.png b/src/assets/images/avatar_menu/landscape_background.png
new file mode 100644
index 000000000..c0399e2f7
Binary files /dev/null and b/src/assets/images/avatar_menu/landscape_background.png differ
diff --git a/src/assets/images/avatar_menu/settings-24px.png b/src/assets/images/avatar_menu/settings-24px.png
new file mode 100644
index 000000000..5c57bf54a
Binary files /dev/null and b/src/assets/images/avatar_menu/settings-24px.png differ
diff --git a/src/assets/images/avatar_menu/settings-24px.svg b/src/assets/images/avatar_menu/settings-24px.svg
new file mode 100644
index 000000000..e40c8496e
--- /dev/null
+++ b/src/assets/images/avatar_menu/settings-24px.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24" viewBox="0 0 24 24" width="24"><g><path d="M0,0h24v24H0V0z" fill="none"/><path d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z"/></g></svg>
\ No newline at end of file
diff --git a/src/assets/images/avatar_menu/tests.png b/src/assets/images/avatar_menu/tests.png
new file mode 100644
index 000000000..88acd86fa
Binary files /dev/null and b/src/assets/images/avatar_menu/tests.png differ
diff --git a/src/assets/images/avatar_menu/trophy.png b/src/assets/images/avatar_menu/trophy.png
new file mode 100644
index 000000000..1c26e1946
Binary files /dev/null and b/src/assets/images/avatar_menu/trophy.png differ
diff --git a/src/assets/images/avatar_menu/wardrobe.png b/src/assets/images/avatar_menu/wardrobe.png
new file mode 100644
index 000000000..86f532ed1
Binary files /dev/null and b/src/assets/images/avatar_menu/wardrobe.png differ
diff --git a/src/assets/images/bg_celiac.png b/src/assets/images/bg_celiac.png
new file mode 100644
index 000000000..e88284664
Binary files /dev/null and b/src/assets/images/bg_celiac.png differ
diff --git a/src/assets/images/celiapp_icon_trans.png b/src/assets/images/celiapp_icon_trans.png
index 265a6a535..6fa1daaba 100644
Binary files a/src/assets/images/celiapp_icon_trans.png and b/src/assets/images/celiapp_icon_trans.png differ
diff --git a/src/assets/images/celiapp_icon_trans_ios96x96.png b/src/assets/images/celiapp_icon_trans_ios96x96.png
new file mode 100644
index 000000000..79c7ebd22
Binary files /dev/null and b/src/assets/images/celiapp_icon_trans_ios96x96.png differ
diff --git a/src/assets/images/cross.png b/src/assets/images/cross.png
new file mode 100644
index 000000000..29e6dcb1b
Binary files /dev/null and b/src/assets/images/cross.png differ
diff --git a/src/assets/images/icon.jpeg b/src/assets/images/icon.jpeg
new file mode 100644
index 000000000..206f67ca9
Binary files /dev/null and b/src/assets/images/icon.jpeg differ
diff --git a/src/assets/images/icon.png b/src/assets/images/icon.png
deleted file mode 100644
index 3f5bbc0ca..000000000
Binary files a/src/assets/images/icon.png and /dev/null differ
diff --git a/src/assets/images/notification_icon.png b/src/assets/images/notification_icon.png
new file mode 100644
index 000000000..1f03ca6bd
Binary files /dev/null and b/src/assets/images/notification_icon.png differ
diff --git a/src/assets/images/question.png b/src/assets/images/question.png
new file mode 100644
index 000000000..f359d6718
Binary files /dev/null and b/src/assets/images/question.png differ
diff --git a/src/assets/images/splash.jpg b/src/assets/images/splash.jpg
deleted file mode 100644
index 896632626..000000000
Binary files a/src/assets/images/splash.jpg and /dev/null differ
diff --git a/src/assets/images/splash.png b/src/assets/images/splash.png
deleted file mode 100644
index 1d8de94c8..000000000
Binary files a/src/assets/images/splash.png and /dev/null differ
diff --git a/src/assets/images/web_hi_res_512.png b/src/assets/images/web_hi_res_512.png
new file mode 100644
index 000000000..206f67ca9
Binary files /dev/null and b/src/assets/images/web_hi_res_512.png differ
diff --git a/src/assets/languages/deutsch.json b/src/assets/languages/deutsch.json
index 38adb9565..1043dccbd 100644
--- a/src/assets/languages/deutsch.json
+++ b/src/assets/languages/deutsch.json
@@ -6,10 +6,14 @@
 		"WELCOME": "Hallo!",
 		"ADD_SYMPTOM": "Symptom hinzufügen",
 		"ADD_MEAL": "Mahlzeit hinzufügen",
+        "ADD_GIP": "Add GIP",
+        "GIP_RESULT" : "GIP Ergebnis",
 		"ADD_EMOTION": "Emotion hinzufügen",
+		"ADD_GIP_RESULT": "Add GIP Result",
 		"VIEW_SYMPTOM": "Eintrag: Symptom",
 		"VIEW_MEAL": "Eintrag: Mahlzeit",
 		"VIEW_EMOTION": "Eintrag: Emotion",
+		"VIEW_GIP_RESULT": "View: GIP Result",
 		"LANGUAGE": "Sprache",
 		"SAVE": "Speichern",
 		"EDIT": "Editieren",
@@ -42,14 +46,24 @@
 		"USER_DEFINED_SYMPTOM": "NDS",
 		"VOMITING": "Erbrechen",
 		"WEIGHT_LOSS": "Gewichtsverlust",
-		"CLOATING": "Blähungen",
-		"MORE_SYMPTOMS": "Mehr...",
+		"BLOATING": "Blähungen",
+        "MORE_SYMPTOMS": "Mehr...",
+		"NO_SYMPTOMS": "Keine Symptome",
+		"ABDOMINAL_DISCOMFORT": "Abdominal discomfort",
+		"NAUSEA": "Nausea",
+		"RUMBLING_IN_STOMACH": "Rumbling in stomach",
+		"TENESMUS": "Tenesmus",
+		"HUNGER_PAINS": "Hunger Pains",
+		"LOW_ENERGY": "Low energy",
+		"FOOD_CRAVING": "Food Craving",
+		"LOSS_OF_APPETITE": "Loss of Appetite",
 		"NAME": "Name",
 		"TAGS": "Tags",
 		"TYPES": "Art der Speise",
 		"IMAGE": "Foto",
 		"RATING": "Bewertung",
 		"EATEN_AT": "Gegessen um",
+		"TAKEN_AT": "Taken at",
 		"EMOTION": "Emotion",
 		"UNHAPPY": "Unglücklich",
 		"SLIGHTLY_UNHAPPY": "Etwas unglücklich",
@@ -94,6 +108,15 @@
 		"PICTURE_OR_NAME": "Füge einen Namen oder ein Bild hinzu bevor du speicherst.",
 		"YES": "Ja",
 		"SAVE_EMPTY_FOOD": "Keine Mahlzeit gegessen",
-		"WANT_TO_SAVE_EMPTY_FOOD": "Willst du die Mahlzeit ohne Eintrag speichern?"
+		"WANT_TO_SAVE_EMPTY_FOOD": "Willst du die Mahlzeit ohne Eintrag speichern?",
+		"NO": "No",
+		"WANT_TO_SAVE_EMPTY_GIP": "Do you want to save the GIP result empty?",
+    "SAVE_EMPTY_GIP": "No GIP result entered",
+    "NOTIFICATION_TITLE": "Erinnerung",
+    "NOTIFICATION_BODY": "Vergiss nicht zu protokollieren, was du heute gegessen hast!",
+    "MEAL_NAME": "Short Description",
+    "MEAL_NAME_PLACEHOLDER": "Burgers and chips",
+    "MEAL_NOTES": "Notes",
+    "MEAL_NOTES_PLACEHOLDER": "Key information about the meal, e.g. main ingredients, off-the-shelf product, etc."
 	}
 }
\ No newline at end of file
diff --git a/src/assets/languages/developer.json b/src/assets/languages/developer.json
index 330369d35..69f4cafbc 100644
--- a/src/assets/languages/developer.json
+++ b/src/assets/languages/developer.json
@@ -6,10 +6,14 @@
 		"WELCOME": "Zewas!",
 		"ADD_SYMPTOM": "Neua Zuastand",
 		"ADD_MEAL": "Neus Eassa",
+        "ADD_GIP": "Add GIP",
+        "GIP_RESULT" : "GIP Result",
 		"ADD_EMOTION": "Neus Gfühl",
+		"ADD_GIP_RESULT": "Add GIP Result",
 		"VIEW_SYMPTOM": "Zuastand aschaua",
 		"VIEW_MEAL": "Eassa aschaua",
 		"VIEW_EMOTION": "Gfühl aschaua",
+		"VIEW_GIP_RESULT": "View: GIP Result",
 		"LANGUAGE": "Sproch",
 		"SAVE": "Speichra",
 		"EDIT": "Editiera",
@@ -40,9 +44,17 @@
 		"IRRITABILITY": "Greizt",
 		"STOMACHACHE": "Buchweh",
 		"USER_DEFINED_SYMPTOM": "Mehr",
+		"ABDOMINAL_DISCOMFORT": "Abdominal discomfort",
+		"NAUSEA": "Nausea",
+		"RUMBLING_IN_STOMACH": "Rumbling in stomach",
+		"TENESMUS": "Tenesmus",
+		"HUNGER_PAINS": "Hunger Pains",
+		"LOW_ENERGY": "Low energy",
+		"FOOD_CRAVING": "Food Craving",
+		"LOSS_OF_APPETITE": "Loss of Appetite",
 		"VOMITING": "Kotza",
 		"WEIGHT_LOSS": "Abnia",
-		"CLOATING": "Furzerei",
+		"BLOATING": "Furzerei",
 		"MORE_SYMPTOMS": "Witares",
 		"NAME": "Nama",
 		"TAGS": "Tags",
@@ -50,6 +62,7 @@
 		"IMAGE": "Foto",
 		"RATING": "Bewertung",
 		"EATEN_AT": "Geassa um",
+		"TAKEN_AT": "Taken at",
 		"EMOTION": "Gfühl",
 		"UNHAPPY": "Traurig",
 		"SLIGHTLY_UNHAPPY": "Bizzle traurig",
@@ -94,6 +107,15 @@
 		"PICTURE_OR_NAME": "Namen oder ein Bild einfügen vorm speichern.",
 		"YES": "Ja",
 		"SAVE_EMPTY_FOOD": "Keine Mahlzeit gegessen",
-		"WANT_TO_SAVE_EMPTY_FOOD": "Willst du die Mahlzeit ohne Eintrag speichern?"
+		"WANT_TO_SAVE_EMPTY_FOOD": "Willst du die Mahlzeit ohne Eintrag speichern?",
+		"NO": "No",
+		"WANT_TO_SAVE_EMPTY_GIP": "Do you want to save the GIP result empty?",
+    "SAVE_EMPTY_GIP": "No GIP result entered",
+    "NOTIFICATION_TITLE": "Erinnerung",
+    "NOTIFICATION_BODY": "Vergiss nicht zu protokollieren, was du heute gegessen hast!",
+    "MEAL_NAME": "Short Description",
+    "MEAL_NAME_PLACEHOLDER": "Burgers and chips",
+    "MEAL_NOTES": "Notes",
+    "MEAL_NOTES_PLACEHOLDER": "Key information about the meal, e.g. main ingredients, off-the-shelf product, etc."
 	}
 }
diff --git a/src/assets/languages/english.json b/src/assets/languages/english.json
index e8c1f7ba4..3b87f302a 100644
--- a/src/assets/languages/english.json
+++ b/src/assets/languages/english.json
@@ -6,10 +6,14 @@
 		"WELCOME": "Hello!",
 		"ADD_SYMPTOM": "Add Symptom",
 		"ADD_MEAL": "Add Meal",
+        "ADD_GIP": "Add GIP",
+        "GIP_RESULT" : "GIP Result",
 		"ADD_EMOTION": "Add Emotion",
+		"ADD_GIP_RESULT": "Add GIP Result",
 		"VIEW_SYMPTOM": "View: Symptom",
 		"VIEW_MEAL": "View: Meal",
 		"VIEW_EMOTION": "View: Emotion",
+		"VIEW_GIP_RESULT": "View: GIP Result",
 		"LANGUAGE": "Language",
 		"SAVE": "Save",
 		"EDIT": "Edit",
@@ -20,10 +24,10 @@
 		"SETTINGS": "Settings",
 		"GLUTON_BUDDY": "Buddy",
 		"GLUTON_WELCOME": "Hello! My name is Gluton. Nice to meet you, {0}!",
-		"GLUTON_TICKLE": "Hahaha! Stop! That's where I'm particularly ticklish.! Hahaha!",
+		"GLUTON_TICKLE": "Hahaha! Stop! That's where I'm particularly ticklish! Hahaha!",
 		"GLUTON_THANKS": "Thank you! Really great of you, {0}! Keep it up.",
 		"GLUTON_RESTART": "You should restart the App to apply all changes!",
-		"GLUTON_REFRESH": "I See... well people do make errors, that's what rubbers are for. I will refresh the data for you, {0}.",
+		"GLUTON_REFRESH": "I see... well people do make errors. That's what rubbers are for. I will refresh the data for you, {0}.",
 		"DATE": "Date",
 		"TIME": "Time",
 		"SYMPTOMS": "Symptoms",
@@ -33,23 +37,33 @@
 		"BACK": "Back",
 		"DISCARD": "Discard",
 		"DO_YOU_WANT_TO_DISCARD": "Do you really want to discard the entries?",
-		"SYMPTOM_OCCURED": "Occured at: ",
+		"SYMPTOM_OCCURED": "Occurred at: ",
 		"SELECT_TIME": "Choose time",
 		"DIARRHEA": "Diarrhea",
 		"HEADACHE": "Headache",
 		"IRRITABILITY": "Irritability",
-		"STOMACHACHE": "Stomachache",
+		"STOMACHACHE": "Stomach ache",
+		"ABDOMINAL_DISCOMFORT": "Abdominal discomfort",
+		"NAUSEA": "Nausea",
+		"RUMBLING_IN_STOMACH": "Rumbling in stomach",
+		"TENESMUS": "Tenesmus",
+		"HUNGER_PAINS": "Hunger Pains",
+		"LOW_ENERGY": "Low energy",
+		"FOOD_CRAVING": "Food Craving",
+		"LOSS_OF_APPETITE": "Loss of Appetite",
 		"USER_DEFINED_SYMPTOM": "More...",
 		"VOMITING": "Vomiting",
 		"WEIGHT_LOSS": "Weight loss",
-		"CLOATING": "Cloating",
-		"MORE_SYMPTOMS": "More...",
+		"BLOATING": "Bloating",
+        "MORE_SYMPTOMS": "More...",
+        "NO_SYMPTOMS": "No symptoms",
 		"NAME": "Name",
 		"TAGS": "Tags",
 		"TYPES": "Type of meal",
 		"IMAGE": "Image",
 		"RATING": "Rating",
 		"EATEN_AT": "Eaten at",
+		"TAKEN_AT": "Taken at",
 		"EMOTION": "Emotion",
 		"UNHAPPY": "Unhappy",
 		"SLIGHTLY_UNHAPPY": "Slightly unhappy",
@@ -58,7 +72,7 @@
 		"HAPPY": "Happy",
 		"CAMERA": "Camera",
 		"DEBUG": "Debug",
-		"SYMPTOM_LIST": "Symptomlist",
+		"SYMPTOM_LIST": "Symptom List",
 		"SEARCH": "Search",
 		"NICKNAME": "Nickname",
 		"ADD_NEW_SYMPTOM": "New symptom",
@@ -79,8 +93,8 @@
 		"AUG": "August",
 		"SEP": "September",
 		"OCT": "October",
-		"NOV": "Novemeber",
-		"DEC": "Decemeber",
+		"NOV": "November",
+		"DEC": "December",
 		"PREVIOUS": "Previous",
 		"NEXT": "Next",
 		"MON": "Mon",
@@ -91,9 +105,18 @@
 		"SAT": "Sat",
 		"SUN": "Sun",
 		"NOT_SAVED": "save not possible",
-		"PICTURE_OR_NAME": "Enter a Name or a picture bevore saving.",
+		"PICTURE_OR_NAME": "Enter a name or a picture before saving.",
 		"YES": "Yes",
 		"SAVE_EMPTY_FOOD": "No food eaten",
-		"WANT_TO_SAVE_EMPTY_FOOD": "Do you want to save the food diary entry empty?"
+		"WANT_TO_SAVE_EMPTY_FOOD": "Do you want to save the food diary entry empty?",
+		"NO": "No",
+		"WANT_TO_SAVE_EMPTY_GIP": "Do you want to save the GIP result empty?",
+    "SAVE_EMPTY_GIP": "No GIP result entered",
+    "NOTIFICATION_TITLE": "Reminder",
+    "NOTIFICATION_BODY": "Don't forget to log what you have eaten today!",
+    "MEAL_NAME": "Short Description",
+    "MEAL_NAME_PLACEHOLDER": "Burgers and chips",
+    "MEAL_NOTES": "Notes",
+    "MEAL_NOTES_PLACEHOLDER": "Key information about the meal, e.g. main ingredients, off-the-shelf product, etc."
 	}
 }
\ No newline at end of file
diff --git a/src/components/CeliCalendarPicker.js b/src/components/CeliCalendarPicker.js
index 4b5a62302..39d7e50d3 100644
--- a/src/components/CeliCalendarPicker.js
+++ b/src/components/CeliCalendarPicker.js
@@ -2,13 +2,47 @@ import React from 'react';
 import { View, StyleSheet } from 'react-native';
 import CalendarPicker from 'react-native-calendar-picker';
 import LanguageManager from "../manager/LanguageManager";
+import DatabaseManager from '../manager/DatabaseManager';
+import moment from 'moment';
 
 export default class CeliCalendarPicker extends React.Component {
+    onfocus = () =>
+    {
+        this.setNumberofEventsPerDate();
+    }
+
+    state = {
+        customDatesStyles: []
+    }
+
+    setNumberofEventsPerDate = () => {
+        let customDatesStyles = [];
+        DatabaseManager.getInstance().fetchEventsCount(
+        (_, error) => {  alert(error)}, 
+        (_, {rows: { _array }}) => {
+            for (let i = 0; i < _array.length; i++)
+            {
+                let d = _array[i];
+                const date = moment(d.day + '-' + d.month + '-' + d.year, 'DD-MM-YYYY');
+               
+                customDatesStyles.push({
+                    date: date,
+                    style: {
+                        backgroundColor: 'lightblue'        
+                    }, textStyle: { fontWeight: 'bold' }
+                });
+            }
+            this.setState({customDatesStyles: customDatesStyles});
+        });
+    }
+
   render() {
     return (
       <View style={styles.container}>
         <CalendarPicker
-          onDateChange={(date, type) => this.props.onDateChange(date)}
+          maxDate= {new Date()}
+          customDatesStyles= {this.state.customDatesStyles}
+          onDateChange={(date, type) => {this.props.onDateChange(date);}}
           selectedStartDate={this.props.selectedDate}
           weekdays={[LanguageManager.getInstance().getText("MON"),LanguageManager.getInstance().getText("TUE"),LanguageManager.getInstance().getText("WED"),LanguageManager.getInstance().getText("THU"),LanguageManager.getInstance().getText("FRI"),LanguageManager.getInstance().getText("SAT"),LanguageManager.getInstance().getText("SUN")]}
           months={[LanguageManager.getInstance().getText("JAN"), LanguageManager.getInstance().getText("FEB"), LanguageManager.getInstance().getText("MAR"), LanguageManager.getInstance().getText("APR"), LanguageManager.getInstance().getText("MAY"), LanguageManager.getInstance().getText("JUN"), LanguageManager.getInstance().getText("JUL"), LanguageManager.getInstance().getText("AUG"), LanguageManager.getInstance().getText("SEP"), LanguageManager.getInstance().getText("OCT"), LanguageManager.getInstance().getText("NOV"), LanguageManager.getInstance().getText("DEC")]}
diff --git a/src/components/CircleDisplay.js b/src/components/CircleDisplay.js
new file mode 100644
index 000000000..e44aadb0f
--- /dev/null
+++ b/src/components/CircleDisplay.js
@@ -0,0 +1,95 @@
+import * as React from 'react';
+import * as Native from 'react-native';
+import ProgressCircle from 'react-native-progress-circle';
+
+function roteX(posX, posY, centX, centY, angleRad) {
+  return (Math.cos(angleRad) * (posX - centX) - Math.sin(angleRad) * (posY - centY) + centX);
+}
+
+function roteY(posX, posY, centX, centY, angleRad) {
+  return (Math.sin(angleRad) * (posX - centX) + Math.cos(angleRad) * (posY - centY) + centY);
+}
+
+export default class SymptomCircle extends React.Component {
+
+  render() {
+
+    let angleBetweenDots = ((1 / Number(this.props.maxNumberOfInnerDots)) * 2 * Math.PI);
+
+    let percentComplete = this.props.numberOfInnerDots / this.props.maxNumberOfInnerDots * 100;
+
+    let smallCircleRadius = this.props.progBarSmallRadius;
+    let percentCircleRadius = this.props.progBarBigRadius;
+    let percetnBorderWidth = this.props.progBarBorderWidth;
+    let progressBarX = this.props.progBarX;
+    let progressBarY = this.props.progBarY;
+
+    let centerX = progressBarX + (percentCircleRadius - smallCircleRadius);
+    let centerY = progressBarY + (percentCircleRadius - smallCircleRadius);
+
+    let circleX = centerX;
+    let circleY = centerY - (percentCircleRadius - (smallCircleRadius * 1.5));
+
+    let rotatedX = roteX(circleX, circleY, centerX, centerY, (angleBetweenDots / 2));
+    let rotatedY = roteY(circleX, circleY, centerX, centerY, (angleBetweenDots / 2));
+
+    let setOfCircles = [];
+
+    circleStyle = function (x, y, color) {
+      return {
+        width: smallCircleRadius * 2,
+        height: smallCircleRadius * 2,
+        borderRadius: 100 / 2,
+        backgroundColor: color,
+        position: 'absolute',
+        left: x,
+        top: y
+      }
+    }
+
+    for (let i = 0; i < this.props.numberOfInnerDots; i++) {
+
+      rotatedX = roteX(circleX, circleY, centerX, centerY, (angleBetweenDots * i) + angleBetweenDots / 2);
+      rotatedY = roteY(circleX, circleY, centerX, centerY, (angleBetweenDots * i) + angleBetweenDots / 2);
+      setOfCircles.push(<Native.View key={i} style={circleStyle(rotatedX, rotatedY, this.props.colourInfoList[i])} />)
+    }
+
+    todaysColour = this.props.numberOfInnerDots > 0 ? this.props.colourInfoList[this.props.numberOfInnerDots - 1] : 'grey';
+
+    return (
+      <Native.View style={styles.MainContainer}>
+
+        <Native.View style={{ position: "absolute", top: progressBarY, left: progressBarX }}>
+
+          <ProgressCircle
+            percent={percentComplete}
+            radius={percentCircleRadius}
+            borderWidth={percetnBorderWidth}
+            color={this.props.FinishedBackGroundColour}
+            shadowColor={this.props.UnfinishedBackGroundColour}
+            bgColor={this.props.InsideCircleBGColour}
+          >
+            <Native.Text style={{ fontSize: 18 }}>{"21 Day Challenge"}</Native.Text>
+          </ProgressCircle>
+        </Native.View>
+        {setOfCircles}
+
+
+        <Native.View style={{ width: 100, height: 50, backgroundColor: todaysColour, borderRadius: 20, position: "absolute", top: progressBarY - 60, left: progressBarX + 80 }}>
+          <Native.Text style={{ fontSize: 18, textAlign: 'center', marginTop: 10, color: 'white' }}>{this.props.titleText}</Native.Text>
+        </Native.View>
+
+      </Native.View>
+    );
+  }
+}
+
+const styles = Native.StyleSheet.create({
+  MainContainer:
+  {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center',
+    backgroundColor: '#FFFFFF',
+  },
+});
\ No newline at end of file
diff --git a/src/components/CircleDisplayFull.js b/src/components/CircleDisplayFull.js
new file mode 100644
index 000000000..4fd29be50
--- /dev/null
+++ b/src/components/CircleDisplayFull.js
@@ -0,0 +1,96 @@
+import React, { Suspense } from 'react';
+import { View, Text } from 'react-native';
+import { NavigationEvents } from 'react-navigation';
+import SymptomCircle from './CircleDisplay';
+import DatabaseManager from '../manager/DatabaseManager';
+
+
+let m_dateStack = [];
+
+export default class CircleDisplayFull extends React.Component {
+
+  updateData() {
+    const self = this;
+
+    let maxDateValue = new Date().getUTCDate()
+    m_dateStack.length = 0;
+
+    // for (let i = 0; i <= maxDateValue; i++)
+    // {
+    //   m_dateStack.push(0);
+    // }
+
+    // DatabaseManager.getInstance().fetchEvents(
+    //   new Date().UTC,
+    //   (_, error) => {alert(error)}, 
+    //   (_, {rows: { _array }}) => (
+    //     _array.forEach(element => {
+    //       if( (new Date (element.created).getUTCMonth()) == new Date().getUTCMonth()
+    //        && (new Date (element.created).getUTCFullYear()) == new Date().getUTCFullYear()
+    //        && (new Date (element.created).getUTCDate()) <= maxDateValue)
+    //        {
+    //           if (element.eventType == 3)
+    //           {
+    //             if (element.objData[10] == 0)
+    //             { //gluten
+    //               m_dateStack[new Date (element.created).getUTCDate()] = 1;
+    //             }
+    //             else if (element.objData[10] == 1)
+    //             { //no gluten
+    //               m_dateStack[new Date (element.created).getUTCDate()] = 2;
+    //             }
+    //           }
+    //           else if (element.eventType == 0)
+    //           {  // only symptoms
+    //             if (m_dateStack[new Date (element.created).getUTCDate()] == 0)
+    //             {
+    //                 m_dateStack[new Date (element.created).getUTCDate()] = 3;
+    //             }
+    //           }
+    //        }
+    //     }),
+
+    //     self.setState({data: _array})
+    //   )
+    // )
+
+
+
+    console.log('m_dateStack :', JSON.stringify(m_dateStack));
+
+    self.setState({ data: m_dateStack})
+  }
+
+  componentDidMount() {
+    this.updateData();
+  }
+
+
+  render() {
+
+    return (
+      <View>
+        <NavigationEvents
+          onDidFocus={() => this.updateData()}
+        />
+        {this.state && this.state.data &&
+
+          <SymptomCircle colourInfoList={m_dateStack}
+            progBarX={this.props.progBarX}
+            progBarY={this.props.progBarY}
+            progBarBorderWidth={this.props.progBarBorderWidth}
+            progBarBigRadius={this.props.progBarBigRadius}
+            progBarSmallRadius={this.props.progBarSmallRadius}
+            FinishedBackGroundColour={this.props.FinishedBackGroundColour}
+            UnfinishedBackGroundColour={this.props.UnfinishedBackGroundColour}
+            InsideCircleBGColour={this.props.InsideCircleBGColour}
+            maxNumberOfInnerDots={31}
+            numberOfInnerDots={m_dateStack.length}
+            titleText={"Day 10"}
+          />
+        }
+      </View>
+
+    )
+  }
+}
\ No newline at end of file
diff --git a/src/components/DayChooser.js b/src/components/DayChooser.js
index 40b256cb8..d771e149d 100644
--- a/src/components/DayChooser.js
+++ b/src/components/DayChooser.js
@@ -30,8 +30,16 @@ export default class DayChooser extends React.Component{
         this.props.onDateChanged(newDate);
     }
 
-
     render(){
+        const date = new Date(this.props.date);
+        date.setDate(date.getDate() + daysDiffToProp + 1);
+        date.setHours(0);
+        date.setMinutes(0);
+        date.setSeconds(0);
+        date.setMilliseconds(0);
+
+        const disableFutureButton = date.getTime() >= new Date().getTime();
+        
         return(
             <View style={{
                 flexDirection:'row',
@@ -45,7 +53,7 @@ export default class DayChooser extends React.Component{
                     <Text style ={styles.dateText}> {this.state.currDateString} </Text>
                 </View>
                 <View>      
-                    <Button buttonStyle={styles.button} title = "  >  " onPress={() => this.changeDay(true)}/>
+                    <Button disabled={disableFutureButton} buttonStyle={styles.button} title = "  >  " onPress={() => this.changeDay(true)}/>
                 </View>
             </View>
         )
diff --git a/src/components/EmotionDisplayIcon.js b/src/components/EmotionDisplayIcon.js
new file mode 100644
index 000000000..2ccf8845e
--- /dev/null
+++ b/src/components/EmotionDisplayIcon.js
@@ -0,0 +1,52 @@
+import React from "react";
+import {
+  View,
+  Text,
+  StyleSheet,
+  TouchableOpacity,
+  Image,
+  ImageBackground,
+} from "react-native";
+import {
+    images
+} from './EmoteTracker/EmoteTrackerConstants';
+
+export default function EmotionDisplayIcon(props){
+    var emotionimage;
+    var showimg = true;
+    switch(props.emotionID){
+        case 0:
+            showimg = false;
+            break;
+        case 1:
+            emotionimage = images.unhappy;
+            break;
+        case 2:
+            emotionimage = images.slightlyUnhappy;
+            break;
+        case 3:
+            emotionimage = images.neither;
+            break;
+        case 4:
+            emotionimage = images.slightlyHappy;
+            break;
+        case 5:
+            emotionimage = images.happy;
+            break;
+    }
+    if(showimg){
+        return(
+            <View>
+                <Image
+                    source={emotionimage}
+                    style={{
+                        resizeMode: "center",
+                    }}
+                />
+            </View>
+        )
+    } else {
+        return(<View></View>);
+    }
+
+}
diff --git a/src/components/EntryList.js b/src/components/EntryList.js
index 67caa2256..561442097 100644
--- a/src/components/EntryList.js
+++ b/src/components/EntryList.js
@@ -16,7 +16,8 @@ import DatabaseManager from '../manager/DatabaseManager';
 import { images } from '../components/EmoteTracker/EmoteTrackerConstants';
 import FoodDiaryRatingBar from '../components/FoodDiary/FoodDiaryRatingBar';
 import LanguageManager from '../manager/LanguageManager';
-
+import Events from '../constants/Events';
+import moment from 'moment';
 
 
 export default class EntryList extends React.Component {
@@ -64,21 +65,23 @@ export default class EntryList extends React.Component {
 
   renderItem(item) {
     let objData  = JSON.parse(item.objData);
-    
+    let createdDate = moment(item.created); 
+
+    let time = createdDate.local().format('HH:mm');
     switch(item.eventType) {
-      case 0: {
+      case Events.Symptom: {
         let color = 'transparent';
         switch (objData.severity) {
           case 1: color = 'yellow'; break;
           case 2: color = 'orange'; break;
           case 3: color = 'red'; break;
         }
-        
+        if (objData.symptomID === 0) objData.name = 'NO_SYMPTOMS'; //TODO: Temp solution. Needs to be an entry in the database
         return (
           <TouchableOpacity onPress={() => this.props.navigation.navigate('ViewSymptom', {event: item})}>
             <ListItem
               title={LanguageManager.getInstance().getText(objData.name)}
-              subtitle={LanguageManager.getInstance().getDateAsText(item.created)}
+              subtitle={time}
               leftAvatar={{
                 source: Image.resolveAssetSource(objData.icon),
                 overlayContainerStyle: {
@@ -90,34 +93,42 @@ export default class EntryList extends React.Component {
           </TouchableOpacity>
         )
       }
-      case 1: {
-        if (objData.icon != null) {
+      case Events.Food: {
           return (
             <TouchableOpacity onPress={() => this.props.navigation.navigate('ViewMeal', {event: item})}>
               <ListItem
                 title={objData.name}
                 rightTitle={<FoodDiaryRatingBar active={false} rating={objData.rating} iconSize={5} />}
-                subtitle={LanguageManager.getInstance().getDateAsText(item.created)}
-                leftAvatar={{ source: Image.resolveAssetSource(objData.icon) }}
+                subtitle={time}
+                leftIcon={{ name: 'restaurant', containerStyle: {
+                    margin: 10
+                }}}
                 chevron={true}
               />
             </TouchableOpacity>
           )
-        } else {
+        
+      }
+      case Events.GIP: {        
           return (
-            <TouchableOpacity onPress={() => this.props.navigation.navigate('ViewMeal', {event: item})}>
-              <ListItem
-                title={objData.name}
-                rightTitle={<FoodDiaryRatingBar active={false} rating={objData.rating} iconSize={5} />}
-                subtitle={LanguageManager.getInstance().getDateAsText(item.created)}
-                leftAvatar={{ icon: {name: 'camera'} }}
+            <TouchableOpacity onPress={() => this.props.navigation.navigate('ViewGIP', {event: item})}>
+              <ListItem 
+                title={LanguageManager.getInstance().getText('GIP_RESULT')}
+                subtitle={time}
+                leftAvatar={{ source: Image.resolveAssetSource(require('../assets/images/GIP_icon.png')),
+                overlayContainerStyle: {
+                    flex: 1,
+                    justifyContent: 'center',
+                    backgroundColor: "rgba(255, 150, 10, 1)"
+                  } }
+                }
                 chevron={true}
               />
             </TouchableOpacity>
-          )
-        }
+          )        
       }
-      case 2: {
+      
+      case Events.Emotion: {
         let picture = null;
         let name = '';
         switch (objData.type) {
@@ -132,7 +143,7 @@ export default class EntryList extends React.Component {
           <TouchableOpacity onPress={() => this.props.navigation.navigate('ViewEmote', {event: item})}>
              <ListItem
               title={LanguageManager.getInstance().getText(picture.imgName)}
-              subtitle={LanguageManager.getInstance().getDateAsText(item.created)}
+              subtitle={time}
               leftAvatar={{
                 source: Image.resolveAssetSource(picture.uri)
               }}
diff --git a/src/components/FoodDiary/BackgroundButton.js b/src/components/FoodDiary/BackgroundButton.js
index 794c1dbe8..29adebdce 100644
--- a/src/components/FoodDiary/BackgroundButton.js
+++ b/src/components/FoodDiary/BackgroundButton.js
@@ -1,5 +1,6 @@
 import React from 'react'
 import { TouchableOpacity, View, Text, StyleSheet, Image } from 'react-native'
+
 export default class BackgroundButton extends React.Component {
 
   render() {
diff --git a/src/components/Glutenbuddy/README.md b/src/components/Glutenbuddy/README.md
new file mode 100644
index 000000000..5a7d3a0d4
--- /dev/null
+++ b/src/components/Glutenbuddy/README.md
@@ -0,0 +1,12 @@
+# GlutenBuddy
+
+App for tracking gluten for teenagers suffering from celiac disease
+
+by Lisa Brandstätter and Lukas Prutsch
+
+
+# Usage
+
+```bash
+npm install
+```
diff --git a/src/components/Glutenbuddy/assets/challenges.png b/src/components/Glutenbuddy/assets/challenges.png
new file mode 100644
index 000000000..9cd1ad662
Binary files /dev/null and b/src/components/Glutenbuddy/assets/challenges.png differ
diff --git a/src/components/Glutenbuddy/assets/flag-24px.png b/src/components/Glutenbuddy/assets/flag-24px.png
new file mode 100644
index 000000000..04ae9ee1c
Binary files /dev/null and b/src/components/Glutenbuddy/assets/flag-24px.png differ
diff --git a/src/components/Glutenbuddy/assets/wardrobe.png b/src/components/Glutenbuddy/assets/wardrobe.png
new file mode 100644
index 000000000..6ba2b9af2
Binary files /dev/null and b/src/components/Glutenbuddy/assets/wardrobe.png differ
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/.prettierrc b/src/components/Glutenbuddy/avataaars-lib/avataaars/.prettierrc
new file mode 100644
index 000000000..3618aa1a2
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/.prettierrc
@@ -0,0 +1,10 @@
+{
+  "useTabs": false,
+  "tabWidth": 2,
+  "singleQuote": true,
+  "semi": false,
+  "bracketSpacing": true,
+  "printWidth": 80,
+  "jsxBracketSameLine": true,
+  "trailingComma": "es5"
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/.vscode/extensions.json b/src/components/Glutenbuddy/avataaars-lib/avataaars/.vscode/extensions.json
new file mode 100644
index 000000000..7adbb6cb3
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+	"recommendations": [ "remimarsal.prettier-now", "eg2.tslint" ]
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/.vscode/settings.json b/src/components/Glutenbuddy/avataaars-lib/avataaars/.vscode/settings.json
new file mode 100644
index 000000000..8d963f2c9
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/.vscode/settings.json
@@ -0,0 +1,14 @@
+{
+    "editor.formatOnSave": true,
+    "prettier.useTabs": false,
+    "prettier.tabWidth": 2,
+    "prettier.typescriptEnable": ["typescript"],
+    "prettier.jsonEnable": ["json"],
+    "prettier.singleQuote": true,
+    "prettier.semi": false,
+    "prettier.spaceBeforeFunctionParen": true,
+    "prettier.bracketSpacing": false,
+    "prettier.printWidth": 80,
+    "prettier.arrowParens": false,
+    "editor.tabSize": 2
+}
\ No newline at end of file
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/README.md b/src/components/Glutenbuddy/avataaars-lib/avataaars/README.md
new file mode 100644
index 000000000..a8bfe506b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/README.md
@@ -0,0 +1,88 @@
+# React component for Avataaars
+
+The core React component for [Avataaars Generator](https://getavataaars.com/) developed by [Fang-Pen Lin](https://twitter.com/fangpenlin), based on the Sketch library [Avataaars](https://avataaars.com/) designed by [Pablo Stanley](https://twitter.com/pablostanley). 
+
+<p align="center"><img src='avataaars-example.png?raw=true' style='width: 300px; height: 300px;' /></p>
+
+## Features
+
+ - SVG based
+ - Light weight 
+ - Scalable
+ - Easy to use
+ - Easy to integrate with custom editor
+ - Comes with [official editor](https://getavataaars.com/)
+
+## Usage
+
+First, you need to install the avataaars component package, here you run
+
+```
+yarn add avataaars
+```
+
+or
+
+```
+npm install avataaars --save
+```
+
+if you are using npm. Then, in your React app, import the Avataaar component and put it where you like it to be, for example
+
+```jsx
+import * as React from 'react'
+import Avatar from 'avataaars'
+
+export default class MyComponent extends React.Component {
+  render () {
+    return 
+      <div>
+        Your avatar:
+        <Avatar
+          style={{width: '100px', height: '100px'}}
+          avatarStyle='Circle'
+          topType='LongHairMiaWallace'
+          accessoriesType='Prescription02'
+          hairColor='BrownDark'
+          facialHairType='Blank'
+          clotheType='Hoodie'
+          clotheColor='PastelBlue'
+          eyeType='Happy'
+          eyebrowType='Default'
+          mouthType='Smile'
+          skinColor='Light'
+        />
+      </div>
+  }
+}
+```
+
+To showcase individual pieces of the avatar you can use the Piece component, for example:
+
+```jsx
+import * as React from 'react'
+import {Piece} from 'avataaars';
+
+export default class MyComponent extends React.Component {
+  render () {
+    return 
+      <div>
+        <Piece pieceType="mouth" pieceSize="100" mouthType="Eating"/>
+        <Piece pieceType="eyes" pieceSize="100" eyeType="Dizzy"/>
+        <Piece pieceType="eyebrows" pieceSize="100" eyebrowType="RaisedExcited"/>
+        <Piece pieceType="accessories" pieceSize="100" accessoriesType="Round"/>
+        <Piece pieceType="top" pieceSize="100" topType="LongHairFro" hairColor="Red"/>
+        <Piece pieceType="facialHair" pieceSize="100" facialHairType="BeardMajestic"/>
+        <Piece pieceType="clothe" pieceSize="100" clotheType="Hoodie" clotheColor="Red"/>
+        <Piece pieceType="graphics" pieceSize="100" graphicType="Skull" />
+        <Piece pieceType="skin" pieceSize="100" skinColor="Brown" />
+      </div>
+  }
+}
+```
+
+To explore avatar options and generate the React code, please use [Avataaars Generator](https://getavataaars.com/)
+
+## Collect options
+
+To build your own avatar editor, you may want to use lower level `Avatar` component along with `OptionContext`. For more details usage, please reference to source code of [avataaars-generator](https://github.com/fangpenlin/avataaars-geneator), see how it uses `OptionContext` to collection available options.
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/avataaars-v1.0.3.tgz b/src/components/Glutenbuddy/avataaars-lib/avataaars/avataaars-v1.0.3.tgz
new file mode 100644
index 000000000..7e3ebdb0f
Binary files /dev/null and b/src/components/Glutenbuddy/avataaars-lib/avataaars/avataaars-v1.0.3.tgz differ
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/Skin.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/Skin.d.ts
new file mode 100644
index 000000000..677712fc3
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/Skin.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export interface Props {
+    maskID: string;
+}
+export default class Skin extends React.Component<Props> {
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/Skin.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/Skin.js
new file mode 100644
index 000000000..d200cb794
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/Skin.js
@@ -0,0 +1,60 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var options_1 = require("../options");
+function makeColor(name, color) {
+    var ColorComponent = /** @class */ (function (_super) {
+        __extends(ColorComponent, _super);
+        function ColorComponent() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        ColorComponent.prototype.render = function () {
+            return (React.createElement("g", { id: "Skin/\uD83D\uDC76\uD83C\uDFFD-03-Brown", mask: "url(#" + this.props.maskID + ")", fill: color },
+                React.createElement("g", { transform: "translate(0.000000, 0.000000)", id: "Color" },
+                    React.createElement("rect", { x: "0", y: "0", width: "264", height: "280" }))));
+        };
+        return ColorComponent;
+    }(React.Component));
+    var anyComponent = ColorComponent;
+    anyComponent.displayName = name;
+    anyComponent.optionValue = name;
+    return anyComponent;
+}
+var Tanned = makeColor('Tanned', '#FD9841');
+var Yellow = makeColor('Yellow', '#F8D25C');
+var Pale = makeColor('Pale', '#FFDBB4');
+var Light = makeColor('Light', '#EDB98A');
+var Brown = makeColor('Brown', '#D08B5B');
+var DarkBrown = makeColor('DarkBrown', '#AE5D29');
+var Black = makeColor('Black', '#614335');
+var Skin = /** @class */ (function (_super) {
+    __extends(Skin, _super);
+    function Skin() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Skin.prototype.render = function () {
+        return (React.createElement(options_1.Selector, { option: options_1.SkinOption, defaultOption: Light },
+            React.createElement(Tanned, { maskID: this.props.maskID }),
+            React.createElement(Yellow, { maskID: this.props.maskID }),
+            React.createElement(Pale, { maskID: this.props.maskID }),
+            React.createElement(Light, { maskID: this.props.maskID }),
+            React.createElement(Brown, { maskID: this.props.maskID }),
+            React.createElement(DarkBrown, { maskID: this.props.maskID }),
+            React.createElement(Black, { maskID: this.props.maskID })));
+    };
+    return Skin;
+}(React.Component));
+exports.default = Skin;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/BlazerShirt.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/BlazerShirt.d.ts
new file mode 100644
index 000000000..b41125967
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/BlazerShirt.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class BlazerShirt extends React.Component {
+    static optionValue: string;
+    private path1;
+    private mask1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/BlazerShirt.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/BlazerShirt.js
new file mode 100644
index 000000000..8d6ece093
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/BlazerShirt.js
@@ -0,0 +1,50 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var BlazerShirt = /** @class */ (function (_super) {
+    __extends(BlazerShirt, _super);
+    function BlazerShirt() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        return _this;
+    }
+    BlazerShirt.prototype.render = function () {
+        var _a = this, path1 = _a.path1, mask1 = _a.mask1;
+        return (React.createElement("g", { id: 'Clothing/Blazer-+-Shirt', transform: 'translate(0.000000, 170.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M133.960472,0.294916112 C170.936473,3.32499816 200,34.2942856 200,72.0517235 L200,81 L0,81 L0,72.0517235 C1.22536245e-14,33.9525631 29.591985,2.76498122 67.0454063,0.219526408 C67.0152598,0.593114549 67,0.969227185 67,1.34762511 C67,13.2107177 81.9984609,22.8276544 100.5,22.8276544 C119.001539,22.8276544 134,13.2107177 134,1.34762511 C134,0.994669088 133.986723,0.64370138 133.960472,0.294916112 Z', id: path1 })),
+            React.createElement("g", { id: 'Shirt', transform: 'translate(32.000000, 29.000000)' },
+                React.createElement("mask", { id: mask1, fill: 'white' },
+                    React.createElement("use", { xlinkHref: '#' + path1 })),
+                React.createElement("use", { id: 'Clothes', fill: '#E6E6E6', xlinkHref: '#' + path1 }),
+                React.createElement("g", { id: 'Color/Palette/Black', mask: "url(#" + mask1 + ")", fill: '#262E33' },
+                    React.createElement("g", { transform: 'translate(-32.000000, -29.000000)', id: '\uD83D\uDD8DColor' },
+                        React.createElement("rect", { x: '0', y: '0', width: '264', height: '110' }))),
+                React.createElement("g", { id: 'Shadowy', opacity: '0.599999964', mask: "url(#" + mask1 + ")", fillOpacity: '0.16', fill: '#000000' },
+                    React.createElement("g", { transform: 'translate(60.000000, -25.000000)', id: 'Hola-\uD83D\uDC4B\uD83C\uDFFC' },
+                        React.createElement("ellipse", { cx: '40.5', cy: '27.8476251', rx: '39.6351047', ry: '26.9138272' })))),
+            React.createElement("g", { id: 'Blazer', transform: 'translate(32.000000, 28.000000)' },
+                React.createElement("path", { d: 'M68.784807,1.12222847 C30.512317,2.80409739 -1.89486556e-14,34.3646437 -1.42108547e-14,73.0517235 L0,73.0517235 L0,82 L69.3616767,82 C65.9607412,69.9199941 64,55.7087296 64,40.5 C64,26.1729736 65.7399891,12.7311115 68.784807,1.12222847 Z M131.638323,82 L200,82 L200,73.0517235 C200,34.7067641 170.024954,3.36285166 132.228719,1.17384225 C135.265163,12.7709464 137,26.1942016 137,40.5 C137,55.7087296 135.039259,69.9199941 131.638323,82 Z', id: 'Saco', fill: '#3A4C5A' }),
+                React.createElement("path", { d: 'M149,58 L158.555853,50.83311 L158.555853,50.83311 C159.998897,49.7508275 161.987779,49.7682725 163.411616,50.8757011 L170,56 L149,58 Z', id: 'Pocket-hanky', fill: '#E6E6E6' }),
+                React.createElement("path", { d: 'M69,1.13686838e-13 C65,19.3333333 66.6666667,46.6666667 74,82 L58,82 L44,46 L50,37 L44,31 L63,1 C65.027659,0.369238637 67.027659,0.0359053037 69,1.13686838e-13 Z', id: 'Wing', fill: '#2F4351' }),
+                React.createElement("path", { d: 'M151,1.13686838e-13 C147,19.3333333 148.666667,46.6666667 156,82 L140,82 L126,46 L132,37 L126,31 L145,1 C147.027659,0.369238637 149.027659,0.0359053037 151,1.13686838e-13 Z', id: 'Wing', fill: '#2F4351', transform: 'translate(141.000000, 41.000000) scale(-1, 1) translate(-141.000000, -41.000000) ' }))));
+    };
+    BlazerShirt.optionValue = 'BlazerShirt';
+    return BlazerShirt;
+}(React.Component));
+exports.default = BlazerShirt;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/BlazerSweater.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/BlazerSweater.d.ts
new file mode 100644
index 000000000..c20cbc551
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/BlazerSweater.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class BlazerSweater extends React.Component {
+    static optionValue: string;
+    private path1;
+    private mask1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/BlazerSweater.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/BlazerSweater.js
new file mode 100644
index 000000000..d88d5a172
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/BlazerSweater.js
@@ -0,0 +1,46 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var BlazerSweater = /** @class */ (function (_super) {
+    __extends(BlazerSweater, _super);
+    function BlazerSweater() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        return _this;
+    }
+    BlazerSweater.prototype.render = function () {
+        var _a = this, path1 = _a.path1, mask1 = _a.mask1;
+        return (React.createElement("g", { id: 'Clothing/Blazer-+-Sweater', transform: 'translate(0.000000, 170.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M105.192402,29.0517235 L104,29.0517235 L104,29.0517235 C64.235498,29.0517235 32,61.2872215 32,101.051724 L32,110 L232,110 L232,101.051724 C232,61.2872215 199.764502,29.0517235 160,29.0517235 L160,29.0517235 L158.807598,29.0517235 C158.934638,30.0353144 159,31.0364513 159,32.0517235 C159,45.8588423 146.911688,57.0517235 132,57.0517235 C117.088312,57.0517235 105,45.8588423 105,32.0517235 C105,31.0364513 105.065362,30.0353144 105.192402,29.0517235 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("use", { id: 'Clothes', fill: '#E6E6E6', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+            React.createElement("g", { id: 'Color/Palette/Black', mask: "url(#" + mask1 + ")", fillRule: 'evenodd', fill: '#262E33' },
+                React.createElement("rect", { id: '\uD83D\uDD8DColor', x: '0', y: '0', width: '264', height: '110' })),
+            React.createElement("g", { id: 'Blazer', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(32.000000, 28.000000)' },
+                React.createElement("path", { d: 'M68.784807,1.12222847 C30.512317,2.80409739 1.24427139e-14,34.3646437 0,73.0517235 L0,82 L69.3616767,82 C65.9607412,69.9199941 64,55.7087296 64,40.5 C64,26.1729736 65.7399891,12.7311115 68.784807,1.12222847 Z M131.638323,82 L200,82 L200,73.0517235 C200,34.7067641 170.024954,3.36285166 132.228719,1.17384225 C135.265163,12.7709464 137,26.1942016 137,40.5 C137,55.7087296 135.039259,69.9199941 131.638323,82 Z', id: 'Saco', fill: '#3A4C5A' }),
+                React.createElement("path", { d: 'M149,58 L158.555853,50.83311 L158.555853,50.83311 C159.998897,49.7508275 161.987779,49.7682725 163.411616,50.8757011 L170,56 L149,58 Z', id: 'Pocket-hanky', fill: '#E6E6E6' }),
+                React.createElement("path", { d: 'M69,1.13686838e-13 C65,19.3333333 66.6666667,46.6666667 74,82 L58,82 L44,46 L50,37 L44,31 L63,1 C65.027659,0.369238637 67.027659,0.0359053037 69,1.13686838e-13 Z', id: 'Wing', fill: '#2F4351' }),
+                React.createElement("path", { d: 'M151,1.13686838e-13 C147,19.3333333 148.666667,46.6666667 156,82 L140,82 L126,46 L132,37 L126,31 L145,1 C147.027659,0.369238637 149.027659,0.0359053037 151,1.13686838e-13 Z', id: 'Wing', fill: '#2F4351', transform: 'translate(141.000000, 41.000000) scale(-1, 1) translate(-141.000000, -41.000000) ' })),
+            React.createElement("path", { d: 'M156,21.5390062 C162.772319,26.1359565 167,32.6563196 167,39.8878801 C167,47.2887711 162.572015,53.9447688 155.520105,58.5564942 L149.57933,53.8764929 L145,54.207887 L146,51.0567821 L145.922229,50.995516 C152.022491,47.8530505 156,42.7003578 156,36.8768102 L156,21.5390062 Z M108,21.5390062 C101.227681,26.1359565 97,32.6563196 97,39.8878801 C97,47.2887711 101.427985,53.9447688 108.479895,58.5564942 L114.42067,53.8764929 L119,54.207887 L118,51.0567821 L118.077771,50.995516 C111.977509,47.8530505 108,42.7003578 108,36.8768102 L108,21.5390062 Z', id: 'Collar', fill: '#F2F2F2', fillRule: 'evenodd' })));
+    };
+    BlazerSweater.optionValue = 'BlazerSweater';
+    return BlazerSweater;
+}(React.Component));
+exports.default = BlazerSweater;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/CollarSweater.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/CollarSweater.d.ts
new file mode 100644
index 000000000..f03076849
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/CollarSweater.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class CollarSweater extends React.Component {
+    static optionValue: string;
+    private path1;
+    private mask1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/CollarSweater.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/CollarSweater.js
new file mode 100644
index 000000000..ad984f62a
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/CollarSweater.js
@@ -0,0 +1,41 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Colors_1 = require("./Colors");
+var CollarSweater = /** @class */ (function (_super) {
+    __extends(CollarSweater, _super);
+    function CollarSweater() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        return _this;
+    }
+    CollarSweater.prototype.render = function () {
+        var _a = this, path1 = _a.path1, mask1 = _a.mask1;
+        return (React.createElement("g", { id: 'Clothing/Collar-+-Sweater', transform: 'translate(0.000000, 170.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M105.192402,29.0517235 L104,29.0517235 L104,29.0517235 C64.235498,29.0517235 32,61.2872215 32,101.051724 L32,110 L232,110 L232,101.051724 C232,61.2872215 199.764502,29.0517235 160,29.0517235 L160,29.0517235 L158.807598,29.0517235 C158.934638,30.0353144 159,31.0364513 159,32.0517235 C159,45.8588423 146.911688,57.0517235 132,57.0517235 C117.088312,57.0517235 105,45.8588423 105,32.0517235 C105,31.0364513 105.065362,30.0353144 105.192402,29.0517235 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("use", { id: 'Clothes', fill: '#E6E6E6', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+            React.createElement(Colors_1.default, { maskID: mask1 }),
+            React.createElement("path", { d: 'M156,22.2794906 C162.181647,26.8351858 166,33.1057265 166,40.027915 C166,47.2334941 161.862605,53.7329769 155.228997,58.3271669 L149.57933,53.8764929 L145,54.207887 L146,51.0567821 L145.922229,50.995516 C152.022491,47.8530505 156,42.7003578 156,36.8768102 L156,22.2794906 Z M108,21.5714994 C101.232748,26.1740081 97,32.7397769 97,40.027915 C97,47.4261549 101.361602,54.080035 108.308428,58.6915723 L114.42067,53.8764929 L119,54.207887 L118,51.0567821 L118.077771,50.995516 C111.977509,47.8530505 108,42.7003578 108,36.8768102 L108,21.5714994 Z', id: 'Collar', fill: '#F2F2F2', fillRule: 'evenodd' })));
+    };
+    CollarSweater.optionValue = 'CollarSweater';
+    return CollarSweater;
+}(React.Component));
+exports.default = CollarSweater;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Colors.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Colors.d.ts
new file mode 100644
index 000000000..de3fcf1d9
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Colors.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export interface Props {
+    maskID: string;
+}
+export default class Colors extends React.Component<Props> {
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Colors.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Colors.js
new file mode 100644
index 000000000..42f7b3818
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Colors.js
@@ -0,0 +1,75 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var options_1 = require("../../options");
+function makeColor(name, color) {
+    var ColorComponent = /** @class */ (function (_super) {
+        __extends(ColorComponent, _super);
+        function ColorComponent() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        ColorComponent.prototype.render = function () {
+            return (React.createElement("g", { id: 'Color/Palette/Gray-01', mask: "url(#" + this.props.maskID + ")", fillRule: 'evenodd', fill: color },
+                React.createElement("rect", { id: '\uD83D\uDD8DColor', x: '0', y: '0', width: '264', height: '110' })));
+        };
+        return ColorComponent;
+    }(React.Component));
+    var anyComponent = ColorComponent;
+    anyComponent.displayName = name;
+    anyComponent.optionValue = name;
+    return anyComponent;
+}
+var Black = makeColor('Black', '#262E33');
+var Blue01 = makeColor('Blue01', '#65C9FF');
+var Blue02 = makeColor('Blue02', '#5199E4');
+var Blue03 = makeColor('Blue03', '#25557C');
+var Gray01 = makeColor('Gray01', '#E6E6E6');
+var Gray02 = makeColor('Gray02', '#929598');
+var Heather = makeColor('Heather', '#3C4F5C');
+var PastelBlue = makeColor('PastelBlue', '#B1E2FF');
+var PastelGreen = makeColor('PastelGreen', '#A7FFC4');
+var PastelOrange = makeColor('PastelOrange', '#FFDEB5');
+var PastelRed = makeColor('PastelRed', '#FFAFB9');
+var PastelYellow = makeColor('PastelYellow', '#FFFFB1');
+var Pink = makeColor('Pink', '#FF488E');
+var Red = makeColor('Red', '#FF5C5C');
+var White = makeColor('White', '#FFFFFF');
+var Colors = /** @class */ (function (_super) {
+    __extends(Colors, _super);
+    function Colors() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Colors.prototype.render = function () {
+        return (React.createElement(options_1.Selector, { option: options_1.ClotheColorOption, defaultOption: Gray01 },
+            React.createElement(Black, { maskID: this.props.maskID }),
+            React.createElement(Blue01, { maskID: this.props.maskID }),
+            React.createElement(Blue02, { maskID: this.props.maskID }),
+            React.createElement(Blue03, { maskID: this.props.maskID }),
+            React.createElement(Gray01, { maskID: this.props.maskID }),
+            React.createElement(Gray02, { maskID: this.props.maskID }),
+            React.createElement(Heather, { maskID: this.props.maskID }),
+            React.createElement(PastelBlue, { maskID: this.props.maskID }),
+            React.createElement(PastelGreen, { maskID: this.props.maskID }),
+            React.createElement(PastelOrange, { maskID: this.props.maskID }),
+            React.createElement(PastelRed, { maskID: this.props.maskID }),
+            React.createElement(PastelYellow, { maskID: this.props.maskID }),
+            React.createElement(Pink, { maskID: this.props.maskID }),
+            React.createElement(Red, { maskID: this.props.maskID }),
+            React.createElement(White, { maskID: this.props.maskID })));
+    };
+    return Colors;
+}(React.Component));
+exports.default = Colors;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/GraphicShirt.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/GraphicShirt.d.ts
new file mode 100644
index 000000000..8a92ea52b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/GraphicShirt.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class GraphicShirt extends React.Component {
+    static optionValue: string;
+    private path1;
+    private mask1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/GraphicShirt.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/GraphicShirt.js
new file mode 100644
index 000000000..bc048e8ab
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/GraphicShirt.js
@@ -0,0 +1,42 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Colors_1 = require("./Colors");
+var Graphics_1 = require("./Graphics");
+var GraphicShirt = /** @class */ (function (_super) {
+    __extends(GraphicShirt, _super);
+    function GraphicShirt() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        return _this;
+    }
+    GraphicShirt.prototype.render = function () {
+        var _a = this, path1 = _a.path1, mask1 = _a.mask1;
+        return (React.createElement("g", { id: 'Clothing/Graphic-Shirt', transform: 'translate(0.000000, 170.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M165.624032,29.2681342 C202.760022,32.1373245 232,63.1798426 232,101.051724 L232,110 L32,110 L32,101.051724 C32,62.8348009 61.7752018,31.5722494 99.3929298,29.1967444 C99.1342224,30.2735458 99,31.3767131 99,32.5 C99,44.3741221 113.998461,54 132.5,54 C151.001539,54 166,44.3741221 166,32.5 C166,31.4015235 165.871641,30.3222877 165.624025,29.2681336 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("use", { id: 'Clothes', fill: '#E6E6E6', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+            React.createElement(Colors_1.default, { maskID: mask1 }),
+            React.createElement(Graphics_1.default, { maskID: mask1 })));
+    };
+    GraphicShirt.optionValue = 'GraphicShirt';
+    return GraphicShirt;
+}(React.Component));
+exports.default = GraphicShirt;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Graphics.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Graphics.d.ts
new file mode 100644
index 000000000..11cb96621
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Graphics.d.ts
@@ -0,0 +1,53 @@
+import * as React from 'react';
+export interface Props {
+    maskID: string;
+}
+export declare class Skull extends React.Component<Props> {
+    static optionValue: string;
+    render(): JSX.Element;
+}
+export declare class SkullOutline extends React.Component<Props> {
+    static optionValue: string;
+    render(): JSX.Element;
+}
+export declare class Bat extends React.Component<Props> {
+    static optionValue: string;
+    render(): JSX.Element;
+}
+export declare class Cumbia extends React.Component<Props> {
+    static optionValue: string;
+    render(): JSX.Element;
+}
+export declare class Deer extends React.Component<Props> {
+    static optionValue: string;
+    render(): JSX.Element;
+}
+export declare class Diamond extends React.Component<Props> {
+    static optionValue: string;
+    render(): JSX.Element;
+}
+export declare class Hola extends React.Component<Props> {
+    static optionValue: string;
+    render(): JSX.Element;
+}
+export declare class Selena extends React.Component<Props> {
+    static optionValue: string;
+    render(): JSX.Element;
+}
+export declare class Pizza extends React.Component<Props> {
+    static optionValue: string;
+    render(): JSX.Element;
+}
+export declare class Resist extends React.Component<Props> {
+    static optionValue: string;
+    render(): JSX.Element;
+}
+export declare class Bear extends React.Component<Props> {
+    static optionValue: string;
+    private mask1;
+    private path1;
+    render(): JSX.Element;
+}
+export default class Graphics extends React.Component<Props> {
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Graphics.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Graphics.js
new file mode 100644
index 000000000..5ea9fcf73
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Graphics.js
@@ -0,0 +1,234 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var options_1 = require("../../options");
+var Skull = /** @class */ (function (_super) {
+    __extends(Skull, _super);
+    function Skull() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Skull.prototype.render = function () {
+        return (React.createElement("g", { id: 'Clothing/Graphic/Skull', mask: "url(#" + this.props.maskID + ")", fillRule: 'evenodd', fill: '#FFFFFF' },
+            React.createElement("g", { transform: 'translate(77.000000, 58.000000)', id: 'Fill-49' },
+                React.createElement("path", { d: 'M65.2820354,19.9288113 C64.9841617,22.7059411 59.588846,24.2025715 57.6102394,22.3766824 C56.6984983,21.5350479 56.6825881,19.8029182 56.4815012,18.6751632 C56.1014249,16.5420247 55.8256486,14.4172496 55.7306295,12.2519776 C55.6727342,10.9274596 55.3253621,9.86749314 56.7745135,9.67029008 C57.65797,9.55055964 58.5675014,10.137767 59.2896464,10.6026028 C61.736719,12.1758255 65.6201265,16.7414286 65.2820354,19.9288113 M52.8813831,14.0756657 C53.1659984,16.901216 54.2014853,21.8145656 51.9457767,24.1810024 C49.9296045,26.2960933 45.7863308,24.19905 45.1631825,21.7084809 C44.3897714,18.6188195 47.4383369,14.9274245 49.307782,12.8387447 C49.881874,12.1969544 51.151594,10.4256483 52.1442119,11.018578 C52.526056,11.2461539 52.8367463,13.6301981 52.8813831,14.0756657 M54.3212536,25.1062722 C54.9678252,23.5832306 61.2342228,28.1246236 58.2744891,30.2850536 C57.7918806,30.6376421 54.1148633,31.7513112 53.4099544,31.2274906 C51.9250051,30.1235056 53.8408548,26.2630794 54.3212536,25.1062722 M73.3250687,17.5267194 C72.8817937,2.05112066 53.065234,-2.31331777 42.4756895,6.50447654 C38.426551,9.87585667 36.113389,14.0039155 36.0073212,19.2826191 C35.9171635,23.7544627 36.6256081,27.9718792 40.0409914,31.0465744 C41.5219631,32.379896 42.5004386,33.1955596 43.2862243,35.0170469 C44.1095756,36.9234899 44.4852324,39.3524331 46.0280771,40.8495037 C46.8788292,41.6752915 48.1176128,42.3417322 49.2940816,41.8091079 C51.455655,40.8301355 50.7644465,37.8320326 51.4194152,36.1606486 C53.4559171,41.1294616 58.6302582,42.7141291 59.5694002,36.4097935 C60.6000257,38.2286397 63.2945899,40.610483 65.268335,38.6195243 C66.0806376,37.8003393 66.2030575,36.4705391 66.3409457,35.3929652 C66.5857855,33.4807998 66.1601884,32.7294032 67.6955199,31.4180909 C71.7349355,27.9683578 73.4691441,22.7464381 73.3250687,17.5267194' }))));
+    };
+    Skull.optionValue = 'Skull';
+    return Skull;
+}(React.Component));
+exports.Skull = Skull;
+var SkullOutline = /** @class */ (function (_super) {
+    __extends(SkullOutline, _super);
+    function SkullOutline() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    SkullOutline.prototype.render = function () {
+        return (React.createElement("g", { id: 'Clothing/Graphic/Skull-Outline', mask: "url(#" + this.props.maskID + ")", strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("g", { transform: 'translate(77.000000, 58.000000)', id: 'Skull' },
+                React.createElement("g", { transform: 'translate(36.000000, 1.000000)' },
+                    React.createElement("path", { d: 'M36.3353853,17.0393673 C36.1551375,18.0777567 35.8927571,19.1087846 35.3466862,20.0285256 C34.6274709,21.2401241 33.3213404,21.7355025 32.5643885,22.8466397 C31.3705799,24.5990841 32.9555173,27.1231756 31.7781352,28.6842237 C30.5119611,30.3630542 27.6359878,29.346749 26.5163205,31.5755188 C25.3358307,33.925968 27.0535122,37.0679834 25.5729054,39.4058749 C24.1038415,39.0369393 23.6514462,33.5197923 21.3841422,37.0389708 C19.9319488,39.2928559 20.9126566,40.513981 18.7354764,37.2741024 C17.9789685,36.1486754 17.1247893,35.1384326 15.6392989,35.8810671 C14.5955488,36.4024269 14.3806721,38.7178013 13.4297097,38.9672226 C11.0962556,39.5786511 11.0105713,33.3500473 10.2172146,32.1709255 C9.78124586,31.523123 9.3750224,31.1394645 8.59986813,30.8939404 C7.92815655,30.6808931 6.73124021,31.1087199 6.17495825,30.7934791 C5.13032022,30.2019696 4.98914092,28.23821 4.94962847,27.1963565 C4.8759311,25.2572791 5.52544468,23.2770647 4.98958488,21.3579064 C4.53896541,19.7461945 3.1027546,18.7545717 2.63348882,17.1753366 C0.0993647654,8.64045187 11.6836147,3.89495204 18.2986197,3.63037495 C26.0390634,3.32033043 37.3356273,7.85191686 36.3353853,17.0393673 M38.172936,11.7240091 C36.716747,8.28277481 33.5180147,5.54736808 30.2580159,3.71135026 C28.6748543,2.82018878 26.955841,2.16285976 25.1728973,1.77140691 C23.531577,1.41069869 21.6150014,1.64842836 20.0482663,1.19462018 C18.728373,0.811827785 17.9097107,-0.0477230086 16.3562944,0.00207464445 C14.238161,0.0696262433 12.0370069,1.17426809 10.1879133,2.08751375 C6.5279065,3.89538507 3.41663437,6.23630778 1.4618782,9.83126531 C-0.636277062,13.6895009 -0.437382953,17.1865952 1.81083082,20.7832848 C3.95648981,24.2167247 0.837226393,29.045365 3.97824385,32.3086268 C5.29902504,33.6808769 6.59938407,32.6801606 7.84957562,33.3409538 C8.81163708,33.8493229 8.77123671,36.8034063 9.03805671,37.6694524 C10.2385247,41.5623298 14.5524847,43.0692501 16.5436456,38.8602659 C17.4830651,41.2128802 21.1990108,43.6239527 22.9291232,40.5460247 C24.0106099,41.9455552 25.8832335,42.541395 27.3123409,41.3414881 C28.6557641,40.2130299 28.8040467,37.585879 28.8724166,35.9984164 C28.9261357,34.7604034 28.3747373,33.2339971 29.3261438,32.3402375 C30.3734455,31.3559761 32.5204364,31.7708122 33.6951548,30.5011885 C35.0359141,29.0518603 34.4849597,27.3552759 34.5879584,25.6288129 C34.6922891,23.8828639 35.0035051,24.3280116 36.2980926,23.0670485 C39.1833891,20.2567287 39.6717451,15.2600755 38.172936,11.7240091', id: 'Boo!', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M14.4199416,28.1214878 C16.4409104,26.2992475 16.0109503,20.7236412 15.8441352,18.1620823 C15.5281264,13.3012213 12.4886458,14.7535905 10.6384079,17.7811955 C9.23849255,20.072024 5.8716471,23.7758196 7.38120621,26.6576793 C8.58337131,28.9535919 12.5610889,29.793746 14.4199416,28.1214878', id: 'Boo!', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M27.7905585,19.2735023 C26.7563456,17.3532744 26.3690889,17.0619469 25.1393718,15.4887787 C24.3486011,14.4775769 23.2406052,12.6869687 21.7361817,13.0471169 C19.1541926,13.6660822 20.2075808,19.6585611 20.238428,21.4487472 C20.2617717,22.8065864 19.9608037,24.2138247 21.0892255,25.1768941 C22.2443259,26.1627631 24.1422588,26.073676 25.5295464,25.8676357 C29.7877025,25.2338929 29.5913646,22.6136348 27.7905585,19.2735023', id: 'Boo!', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M19.2396436,31.8300192 C18.9563137,31.7944779 19.3174042,31.4678578 19.3591799,31.2433628 C19.5473771,31.8574625 19.6855263,31.8862554 19.2396436,31.8300192 M20.2848621,27.5191742 C17.6678865,24.7492021 12.711061,33.9166085 16.2049116,34.9450569 C17.0098167,35.1821488 17.604189,34.5815458 18.3598733,34.4767215 C19.4596896,34.3242088 20.3837174,34.9635023 21.3333895,33.9548492 C22.8244907,32.3712368 21.5203459,28.8566969 20.2848621,27.5191742', id: 'Boo!', fill: '#FFFFFF' })))));
+    };
+    SkullOutline.optionValue = 'SkullOutline';
+    return SkullOutline;
+}(React.Component));
+exports.SkullOutline = SkullOutline;
+var Bat = /** @class */ (function (_super) {
+    __extends(Bat, _super);
+    function Bat() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Bat.prototype.render = function () {
+        return (React.createElement("g", { id: 'Clothing/Graphic/Bat', mask: "url(#" + this.props.maskID + ")", fillRule: 'evenodd', fill: '#FFFFFF' },
+            React.createElement("g", { transform: 'translate(77.000000, 58.000000)', id: 'Batman!' },
+                React.createElement("path", { d: 'M87.6852404,13.4031978 C86.29151,6.97182978 81.4755637,3.2534243 75.1844381,1.81688169 C72.6586144,1.2402574 64.2721154,-0.570361088 65.5784818,4.22465302 C66.1709196,6.39748644 65.8414841,8.18940114 64.0250388,9.99135202 C62.2550056,11.7463153 58.793658,12.1906445 57.0732221,9.97994727 C55.5989529,8.08493361 57.5000322,5.25883596 56.3515582,3.41309083 C55.9056373,2.69596 55.1361961,2.32963935 54.323983,2.68090573 C53.1827893,3.17450341 53.7902429,4.23560158 53.2510425,4.99880761 C52.4024277,6.20178089 52.005649,5.82542406 51.2416681,4.6261003 C50.7616206,3.87247426 51.2334777,3.05133209 49.9949096,2.72926188 C48.5615922,2.35655457 48.0924652,3.5572469 47.9627841,4.65164695 C47.8813352,5.33866923 48.2849392,6.44356164 48.2990449,7.14016392 C48.3263462,8.50417231 48.2084956,10.4630526 47.5741958,11.668763 C46.449383,13.8060136 44.8695487,13.1221847 43.1909749,11.7645629 C41.2107218,10.1633357 40.6296595,8.3800886 41.0127875,5.94768301 C41.4719041,3.03125972 41.3053663,0.239376333 37.7334484,2.06368053 C32.7127425,4.62792506 28.0537786,9.19894983 25.144827,13.9830154 C22.6999971,18.0025063 20.7757117,22.8759851 22.9416134,27.4556775 C25.1521073,32.1307136 28.8036539,36.1460988 33.9080837,37.3394921 C35.2294658,37.6483328 38.9997729,39.1501106 40.2533568,37.8905698 C42.1999383,35.9335142 37.7052371,34.1082977 36.8179454,32.9158167 C35.5598113,31.2256324 34.4805006,28.0012808 35.8614905,26.0944062 C37.6206031,23.6670187 39.4602546,25.0200786 40.9063125,26.7376343 C42.0415909,28.085676 43.6550967,31.5636693 45.4119342,28.759925 C46.621381,26.8288723 46.513086,23.6583511 49.812446,25.0433443 C54.5269225,27.0213845 54.6716193,36.1552226 55.5120438,40.3343801 C55.879246,42.1637024 57.5473544,44.3981215 58.9829469,41.8594236 C59.7719539,40.4634819 59.3460539,37.437573 59.2022672,35.9960123 C58.9055932,33.0111605 58.1225014,30.0760334 59.092607,27.1190092 C59.6536484,25.4082963 61.093336,22.9594679 63.2223811,24.2751201 C64.9469121,25.3407802 64.2284333,30.0910877 66.5745236,30.0824201 C68.6412307,30.075121 68.0774592,26.2910242 69.1777009,25.0433443 C70.8571848,23.1387506 74.0937518,24.0442879 75.0870635,26.2919365 C76.4243714,29.3169331 72.88476,31.4176885 73.0435625,34.0768205 C73.1982698,36.6684365 76.5376717,35.657063 77.9345873,34.9996931 C80.8057722,33.6493704 83.0526678,31.1467116 84.6097509,28.428731 C87.0172691,24.2253954 88.7354298,18.2068795 87.6852404,13.4031978' }))));
+    };
+    Bat.optionValue = 'Bat';
+    return Bat;
+}(React.Component));
+exports.Bat = Bat;
+var Cumbia = /** @class */ (function (_super) {
+    __extends(Cumbia, _super);
+    function Cumbia() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Cumbia.prototype.render = function () {
+        return (React.createElement("g", { id: 'Clothing/Graphic/Cumbia', mask: "url(#" + this.props.maskID + ")", strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("g", { transform: 'translate(77.000000, 58.000000)', id: 'Group' },
+                React.createElement("g", { transform: 'translate(0.000000, 6.000000)' },
+                    React.createElement("path", { d: 'M10.271566,24.1315073 C13.5453197,23.5731503 16.0029461,20.5783262 15.4519585,17.3443595 C14.9878717,14.6197774 13.7065483,17.0011951 12.4758861,18.1969085 C11.1405733,19.4948562 10.0263951,20.7706412 7.9400381,20.2508902 C4.33273358,19.3518711 3.08247252,14.8503409 4.09976568,11.7711556 C4.65593031,10.0878629 5.87660814,8.76060323 7.57838317,8.07498941 C9.42992328,7.32896437 10.7818767,8.16542752 12.3264908,9.1691833 C12.6145575,9.35649386 14.0556303,10.5386236 14.3204002,10.4181586 C14.7822683,10.2079704 14.435405,7.98955578 14.3651448,7.69393398 C14.0267867,6.27266155 13.0993526,5.11877135 11.7481388,4.45603516 C8.41484886,2.82099993 4.23436935,4.94468693 2.10881463,7.51091298 C-2.77648522,13.4083357 1.18803674,25.6753895 10.271566,24.1315073', id: 'Fill-1', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M20.283037,5.0382162 C20.2819296,5.04100097 20.2826679,5.03926048 20.283037,5.0382162 M18.6886879,17.9031695 C19.1918363,21.3771733 21.6658646,24.4038731 25.6412168,24.2597611 C29.9192703,24.1048581 31.6970859,20.1616201 32.6494871,16.7739442 C33.6055798,13.3751292 34.7008413,9.09110464 33.3132148,5.68149867 C32.8931247,4.64939232 32.6284457,3.30051808 31.5966777,4.15126612 C30.3445285,5.18372056 30.188379,8.18953451 30.0824336,9.59271181 C29.8819863,12.2396382 29.3005786,19.5639383 25.9741881,20.5368682 C21.7954354,21.7593834 21.9264829,14.6895419 21.9733647,12.559887 C22.0147092,10.6641531 22.2203245,8.82550695 21.6322721,6.97572174 C21.3192348,5.99095653 21.0416357,4.53521664 20.1036312,5.34175641 C18.8141981,6.45044401 18.6506656,9.16977447 18.5602244,10.6690264 C18.4155185,13.0736776 18.3464879,15.5110498 18.6886879,17.9031695', id: 'Fill-5', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M37.7827156,20.7457507 C37.9712859,21.1583285 38.4071734,22.1476129 38.8028084,22.4248624 C39.7471104,23.085889 38.7480505,23.1327334 39.6027816,22.3662202 C40.4161723,21.6371824 40.7331154,19.6485506 40.8571366,18.6953537 C41.2422552,15.7354812 40.7367418,12.5875371 40.7704668,9.60302793 C41.7938233,11.8206768 42.3544573,14.1868398 43.1555184,16.4766638 C43.7096249,18.0589637 44.5516638,21.2808179 46.809793,21.2301566 C49.2532288,21.1753312 49.3790632,18.0849884 49.7043469,16.4110816 C50.1652562,14.0411017 50.674396,11.6898595 51.3797214,9.37401083 C51.4718308,13.2836103 49.952752,20.3692605 53.4880823,23.2940864 C53.5018625,23.3072722 54.9204913,19.144366 54.954579,18.8882832 C55.1783249,17.1970267 55.0383477,15.4440049 55.0622816,13.7402565 C55.1130505,10.1433001 55.779574,5.73680294 54.762745,2.23422934 C54.4338349,1.10024771 53.7872564,-0.0302639607 52.3530342,0.000618647874 C50.5278914,0.0401761465 50.1202895,1.98612748 49.6550286,3.29915884 C48.3742011,6.91277103 47.2097796,10.5229133 46.2981148,14.2395832 C45.7498104,12.5594305 40.9593998,-2.18198369 37.5092887,3.33767535 C36.9540943,4.22633108 37.1937961,5.55601823 37.1709501,6.53385184 C37.1274339,8.41283302 37.0161049,10.2897322 36.9754898,12.1690604 C36.9138418,15.0116484 36.5653494,18.0756195 37.7827156,20.7457507', id: 'Fill-7', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M62.0203329,7.70997634 C62.739914,7.57453437 67.7552707,5.98272311 67.5433251,7.57379827 C67.3203514,9.24915661 62.9098151,10.8829254 61.7267107,11.4497207 C61.7246429,10.2414163 61.4930536,9.00918877 61.0839813,7.88259125 C61.3958688,7.82517563 61.7081008,7.76739196 62.0203329,7.70997634 M67.7366608,7.0706755 C67.7370055,7.06957135 67.7101246,7.03497476 67.7366608,7.0706755 M67.8590034,15.4110304 C70.1314738,16.6318484 69.1461853,18.8279958 67.4326998,20.0186339 C66.7844565,20.4691256 60.9030521,21.8209691 60.9195942,21.6818466 C60.9202835,21.6855271 60.9192496,21.6869993 60.9164926,21.6866312 C61.0960433,19.9925024 60.6587116,16.6686533 61.9159109,15.6664563 C63.2203241,14.6267183 66.4163948,14.8593252 67.8590034,15.4110304 M67.9210363,7.41553727 C67.9299966,7.4383563 67.9220702,7.41811361 67.9210363,7.41553727 M57.9444294,24.2596607 C58.1677477,24.8109979 58.8039291,26.1720425 59.5100698,26.2047988 C60.3706034,26.2449162 60.3040904,25.1617484 60.4388396,24.49558 C63.8802848,26.2162084 68.9369967,24.4481017 71.346284,21.4654339 C74.1325933,18.014976 72.6941202,13.1953763 68.7674402,11.7202366 C70.879659,10.0319965 72.7933728,6.32096 70.0222271,4.23081061 C67.8262639,2.57459081 64.19424,2.48294665 61.8993688,3.92827446 C59.1637197,5.65111111 58.0495406,9.7614806 57.8096802,12.9340616 C57.553967,16.3156944 56.6513889,21.0591079 57.9444294,24.2596607', id: 'Fill-9', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M76.0506048,15.8714133 C76.1237655,17.940757 75.9002189,20.1580872 76.3823293,22.1766928 C76.5533503,22.8940747 76.8153532,23.6882686 77.1423879,24.3390566 C77.7529985,25.5536025 77.4525393,25.3897603 78.1744543,24.6980999 C80.3464523,22.6164239 79.3828568,16.1236949 79.3306438,13.4500732 C79.2896863,11.3715683 79.3947376,9.17044617 78.8182061,7.16734396 C78.656252,6.60499548 77.6954704,3.81897451 77.1633356,3.88345432 C76.3469995,3.98140725 75.7873513,7.81319908 75.7401407,8.57603396 C75.592256,10.9723573 75.9658759,13.4712141 76.0506048,15.8714133', id: 'Fill-11', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M94.7477626,16.430477 C93.1655372,16.2926323 91.1264105,16.5045376 89.6311966,16.9871715 C90.3280165,15.0708102 91.1056588,12.9329761 91.8694667,11.1973368 C92.343479,10.1066267 92.8411555,9.02761048 93.3628603,7.95745314 C94.6410916,10.6431228 95.3546586,13.7848497 96.19492,16.6232471 C95.7158108,16.535721 95.233425,16.4715824 94.7477626,16.430477 M100.188346,17.1547822 C99.4605809,14.375208 98.6093975,11.6225649 97.7622188,8.8759458 C97.2244951,7.13215631 96.6321618,4.96384744 95.1624324,3.70729846 C90.9986238,0.146013273 88.6354794,9.55701945 87.6142778,11.9390054 C86.6294827,14.2352371 85.3978516,16.5725741 84.764743,18.9878696 C84.4541957,20.1714211 84.3555342,21.4261983 84.5197274,22.6402245 C84.725424,24.1589974 84.5157227,24.3811791 85.8136135,23.5544648 C86.8140635,22.9176858 87.2280051,21.7617741 88.0409617,20.9917569 C88.1847673,20.8556839 88.2586724,20.3241488 88.4301469,20.2373314 C88.6194606,20.1413008 89.9348266,20.4896334 90.2461019,20.5112492 C92.4155638,20.6622052 94.958192,20.2933198 96.9605482,19.4573923 C97.1658807,20.2989895 98.5882817,25.4187356 99.9378698,25.2302178 C100.5353,25.1465897 100.903369,22.1660952 100.929946,21.6933833 C101.017322,20.1398833 100.57826,18.6444979 100.188346,17.1547822', id: 'Fill-13', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M109.301672,3.43213272 C109.038492,2.22890734 108.487555,0.14016215 107.459721,1.31990649 C106.069159,2.9162614 106.369359,6.49285063 106.348516,8.49692176 C106.333584,9.94847693 104.797121,20.5594163 106.905363,20.3801066 C106.815459,20.3801066 107.750277,18.7118855 107.885912,18.4578633 C108.700028,16.9340861 109.016405,15.4885791 109.213945,13.735684 C109.578851,10.499214 109.997264,6.62484253 109.301672,3.43213272', id: 'Fill-15', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M108.164017,24.3012978 C105.924782,21.573307 101.852706,24.9591601 103.122505,27.675428 C104.85153,31.3753862 110.454236,27.1147969 108.164017,24.3012978', id: 'Fill-17', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M94.8984918,28.5446042 C92.0066895,27.8070876 88.6012921,28.3048186 85.6491092,28.3933947 C82.5678984,28.4853064 79.489563,28.6568994 76.4083523,28.7499229 C69.8412367,28.9481999 63.2849033,28.8418345 56.7170689,28.7877252 C44.2631983,28.6854365 31.7816533,29.4770624 19.334252,28.9556122 C16.661689,28.8440582 13.7889353,28.2429265 11.1361398,28.7473286 C10.409056,28.8859372 8.12717022,29.2902742 7.80729649,30.013337 C7.47088995,30.7730903 9.20934979,31.5680517 10.1384213,31.968312 C12.560117,33.0119536 15.4670145,32.8262773 18.0389431,32.9319015 C20.9688428,33.0527208 23.9249793,32.9900875 26.856676,32.9181889 C38.9324486,32.6213292 50.9456841,31.5750933 63.0376301,31.7529868 C70.0126746,31.8560167 76.974421,31.7911597 83.9494655,31.7544692 C87.2686047,31.7366799 90.9489497,32.2799961 94.2217253,31.6922065 C94.773777,31.5928827 97.9847343,30.8375767 98.0293009,29.8561978 C98.0497872,29.4033107 95.2233973,28.6276211 94.8984918,28.5446042', id: 'Fill-19', fill: '#FFFFFF' })))));
+    };
+    Cumbia.optionValue = 'Cumbia';
+    return Cumbia;
+}(React.Component));
+exports.Cumbia = Cumbia;
+var Deer = /** @class */ (function (_super) {
+    __extends(Deer, _super);
+    function Deer() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Deer.prototype.render = function () {
+        return (React.createElement("g", { id: 'Clothing/Graphic/Deer', mask: "url(#" + this.props.maskID + ")", fillRule: 'evenodd', fill: '#FFFFFF' },
+            React.createElement("g", { transform: 'translate(77.000000, 58.000000)', id: 'oh,-deer!' },
+                React.createElement("path", { d: 'M76.9598206,16.2351328 C77.3545748,17.6603319 74.7317873,18.9054413 73.8540158,19.6535687 C72.3474717,20.9370645 70.7886986,22.2879408 69.0287021,23.2010483 C68.2808959,23.5889965 67.4755973,23.9042554 66.6674645,24.1357992 C65.420446,24.4927115 65.5625576,24.2427912 65.0864232,25.3008688 C64.2491394,27.1617948 64.0321258,29.6352706 63.2754123,31.6133978 C61.5708838,36.0670427 57.5083567,46.4138243 51.0084754,41.8719723 C48.9403681,40.4271716 47.8107637,37.6249608 46.6471497,35.4361165 C45.312678,32.9242543 44.0348889,29.927661 43.2668389,27.1858884 C42.8923285,25.8501217 43.1299908,25.3952014 42.1376394,24.7708091 C41.514535,24.3787772 40.4582132,24.2775023 39.7537287,23.9908291 C38.2544724,23.3807295 36.9414591,22.5546042 35.6656945,21.5602318 C34.4279881,20.5948534 29.5561137,16.6096049 33.5340216,15.8696448 C35.3592032,15.5298839 37.7512114,15.6560692 39.6006855,15.7495851 C41.6283052,15.8520851 43.6741443,16.3196647 45.4774626,17.2854514 C47.3184343,18.2720648 46.7783296,17.9862083 48.6865108,17.4345052 C45.3653119,16.3090472 42.0384447,14.4370952 39.8031236,11.6536693 C38.5961879,10.1508806 35.8037572,4.00047299 37.9022302,2.58875006 C40.4225841,0.893212425 40.6331197,7.93508406 41.3416529,9.15569148 C42.9344356,11.8995059 45.8495437,12.9351233 48.3844732,14.454655 C46.6435058,12.7868862 45.3446632,10.9496454 44.7106272,8.58683697 C44.4357163,7.56224546 43.6846711,5.0981621 44.1919809,4.10133952 C44.7207491,3.06123008 45.9641237,2.99507471 46.6499838,3.88041325 C47.2678248,4.67754462 47.1123524,6.5115185 47.3241026,7.47240483 C47.6739156,9.06095045 48.2451958,10.282783 49.3059712,11.5127828 C50.8113007,13.2585495 52.7227209,14.6866071 54.9750468,15.2395353 C60.1015883,16.4977125 61.8947847,11.1317769 62.5826693,6.99461605 C62.7510977,5.98186717 62.5033135,4.30184746 63.6329179,3.81589134 C65.0001846,3.22743524 65.5293577,4.56156854 65.5690356,5.59718594 C65.6564888,7.91058207 64.5127138,11.4535697 63.4029483,13.4419061 C66.1929497,11.7100238 68.4064075,8.96375923 69.3015886,5.75399867 C69.6327773,4.56646894 69.3639395,1.9182123 70.4757294,1.25134983 C72.0154733,0.327216479 72.5049686,2.16772422 72.45112,3.27317229 C72.1324825,9.78825116 67.1525061,15.7132405 60.9627599,17.341806 C62.4810453,18.1005509 62.2814414,18.2716565 63.8114683,17.3650829 C64.6961227,16.840332 65.656084,16.4352324 66.6375037,16.1342663 C68.1076089,15.6834297 69.6931038,15.453111 71.2182722,15.3183501 C72.4377591,15.2105413 76.4921887,14.5012087 76.9598206,16.2351328 Z M58.8595294,24.6214062 C59.7193936,22.4825816 56.3639386,22.4048657 56.0375022,24.7163015 C55.622102,27.6609177 58.7932497,27.8924294 58.8595294,24.6214062 Z M56.9297708,33.6367531 C57.5886752,31.4414328 53.4036129,31.5246305 53.0344702,33.4664333 C52.5980925,35.7582944 56.4400387,35.1974948 56.9297708,33.6367531 Z M51.7024587,27 C54.0260737,27 54.9736078,23.9354052 52.6986912,23.1385385 C49.8083182,22.1255453 48.8835101,27 51.7024587,27 Z' }))));
+    };
+    Deer.optionValue = 'Deer';
+    return Deer;
+}(React.Component));
+exports.Deer = Deer;
+var Diamond = /** @class */ (function (_super) {
+    __extends(Diamond, _super);
+    function Diamond() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Diamond.prototype.render = function () {
+        return (React.createElement("g", { id: 'Clothing/Graphic/Diamond', mask: "url(#" + this.props.maskID + ")", strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("g", { transform: 'translate(77.000000, 58.000000)', id: 'Diamond' },
+                React.createElement("g", { transform: 'translate(29.000000, 2.000000)' },
+                    React.createElement("path", { d: 'M34.7804613,27.7365051 C32.3910217,30.3933795 29.9226048,32.9801662 27.4446301,35.5565142 C28.4300853,32.0044048 29.1846452,27.9785814 30.6489944,24.5994547 C31.0655115,23.6371144 30.7485963,23.5153306 31.576097,23.1057395 C32.1847753,22.8045111 33.6536519,23.1494823 34.3825567,23.1678741 C35.9404713,23.2066461 37.5335988,23.3597457 39.0789374,23.1186635 C37.6281703,24.6436945 36.1869609,26.1712109 34.7804613,27.7365051 M19.5162179,31.798118 C16.8174087,28.5164183 14.1321816,25.2302449 10.8578947,22.4814113 C12.146683,22.6176103 13.5536857,22.4376686 14.8163159,22.687201 C16.7595591,23.0714412 16.6534177,23.6778747 17.6358547,25.6458009 C19.0866218,28.5522078 20.5248129,31.434755 21.6858291,34.4689106 C20.9750337,33.5692019 20.2446197,32.6844056 19.5162179,31.798118 M10.4182378,19.266817 C11.3810563,17.6920783 11.5616476,16.294796 13.3373785,15.4865494 C15.3988361,14.5480688 18.6379102,14.7454082 20.8256308,14.5709343 C19.4553501,16.093977 17.7887788,17.6736865 17.2223558,19.6928116 C16.3480725,17.9749149 15.2599971,16.5189775 13.5521766,15.5223389 C13.3368755,15.4159645 14.7101745,20.0725781 14.8897597,20.3926954 C13.1743936,20.2967597 11.3684803,19.9850926 9.66518708,20.3012334 C9.916204,19.9562622 10.1672209,19.611291 10.4182378,19.266817 M26.8243819,14.2592673 C28.4154971,14.2945597 29.9940364,14.4183318 31.563521,14.6783029 C30.2968665,16.353451 29.9150592,18.3104416 29.4653415,20.3086895 C28.9869505,18.0509676 27.2564932,15.9473394 25.7312761,14.2607585 C26.095477,14.2602615 26.4596779,14.2597644 26.8243819,14.2592673 M23.3257392,15.3334498 C23.5601558,15.1748824 27.7826729,20.4190405 28.3923573,20.889275 C25.0798394,20.8813217 21.7743641,20.7192748 18.4658705,20.5736313 C20.3728949,19.0868752 21.4886374,16.8863171 23.3257392,15.3334498 M26.0124754,32.4289082 C25.6105465,33.7779741 25.2352788,35.1369815 24.797634,36.4756088 C23.2432407,31.7444337 20.9357965,27.288142 18.7898282,22.8020257 C22.1295103,22.8900083 25.465671,23.0107979 28.8058561,23.0575231 C27.9864041,26.2164449 26.9441054,29.3032906 26.0124754,32.4289082 M33.2416622,14.9656131 C34.5188805,16.093977 36.338879,18.4063774 36.9284418,19.1833081 C36.9867944,19.260355 37.0461531,19.3369048 37.1070209,19.4124604 C37.3177947,19.6744198 38.0733606,20.6680759 38.3701542,21.0567898 C36.1426934,20.8306199 33.8251885,20.9270528 31.5901821,20.9066727 C32.0881916,18.8527521 32.6938517,16.8952645 32.1737084,14.7787123 C32.5308668,14.8363732 32.886516,14.8985078 33.2416622,14.9656131 M40.8898811,20.5830758 C38.7323429,17.9068154 36.5199733,13.3247633 33.025858,12.5055811 C29.5538765,11.6918667 25.478247,12.0517501 21.9519372,12.2754346 C18.8773572,12.4702886 13.8690917,12.0721303 11.1572035,13.8690622 C9.76378291,14.7921334 8.73154499,16.8738902 8.2491297,18.4202955 C7.81450321,19.8131041 8.51523782,20.7048596 7.00259677,20.7048596 C6.90651615,20.7048596 9.50672951,24.3777585 9.81308082,24.66656 C12.0853121,26.8064748 14.2574385,28.8688456 16.2701013,31.2642577 C19.1047312,34.6379166 21.6747622,39.6022206 25.414864,41 C24.7292206,40.6609938 28.2067356,38.0334469 28.6242587,37.5811072 C30.7355173,35.2930636 32.8709217,33.0268914 34.9967685,30.7517718 C36.9349813,28.6779682 39.0472459,26.7209776 40.9271061,24.6004489 C42.361776,22.9824645 42.3658003,22.4262358 40.8898811,20.5830758', id: 'Fill-21', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M6.99858316,11.9999257 C7.04159508,12.0142408 6.09038895,9.95483812 6.17394084,10.0812061 C5.69932656,9.36248835 5.12830624,8.8402333 4.43566602,8.35351923 C3.70792411,7.84261755 0.1270582,7.25421678 0,7 C1.49355183,9.65224611 4.16721231,11.1276907 6.99858316,11.9999257', id: 'Fill-23', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M22.3553325,7.19614224 C22.5279973,7.84840006 22.7925782,8.44932951 23.1490753,8.99893058 C23.2186566,9.07737584 24.0076748,4.81518326 23.9999436,4.45201075 C23.9866286,3.8317121 23.6120919,0 22.814054,0 C21.4769753,0 22.1397162,6.46931298 22.3553325,7.19614224', id: 'Fill-25', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M48.969198,5 C45.977552,5 39.2896081,10.8535875 40.0615528,13.9997703 C40.0673207,14.0103781 40.50905,13.6497123 40.4129174,13.7172166 C40.4321439,13.7032335 40.4508897,13.6887683 40.4691549,13.6738209 C41.7405084,12.649202 43.1873037,11.6544779 44.4605798,10.4683308 C45.3723974,9.61874094 46.4476403,8.85642448 47.2772645,7.92727594 C47.3618612,7.83276992 49.2628831,5 48.969198,5', id: 'Fill-27', fill: '#FFFFFF' })))));
+    };
+    Diamond.optionValue = 'Diamond';
+    return Diamond;
+}(React.Component));
+exports.Diamond = Diamond;
+var Hola = /** @class */ (function (_super) {
+    __extends(Hola, _super);
+    function Hola() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Hola.prototype.render = function () {
+        return (React.createElement("g", { id: 'Clothing/Graphic/Hola', mask: "url(#" + this.props.maskID + ")", fillRule: 'evenodd', fill: '#FFFFFF' },
+            React.createElement("g", { transform: 'translate(77.000000, 58.000000)', id: 'Hola' },
+                React.createElement("path", { d: 'M74.6371722,16.9479681 C75.917206,22.7098952 73.7328313,28.1917851 69.3072818,31.9519351 C67.2267705,33.7200766 64.8728066,35.0262382 62.2514759,35.7865716 C60.7921156,36.2102906 59.2674351,36.5090512 57.7541146,36.6572104 C56.61811,36.7683298 54.9700918,36.2570992 53.9631048,36.5456839 C52.8441403,36.8672382 51.4050658,38.4111058 50.2065809,38.9084974 C49.535121,39.1873134 48.8385068,39.4319389 48.1390525,39.6350472 C46.6326292,40.0734193 45.0742742,40.3689236 43.5256565,40.611514 C41.9242956,40.8622449 35.2433712,41.9140123 36.070626,38.9752504 C36.3550329,37.9641861 39.1816559,36.4707903 39.7950984,35.791049 C40.2486888,35.288773 42.9398027,32.427347 42.8140307,31.4960606 C42.7742705,31.2021844 41.0666121,29.8650885 40.6657648,29.4157265 C39.7573668,28.3973356 38.9041462,27.3581862 38.4205328,26.0646425 C37.5920608,23.8487672 37.6354724,21.0667121 37.9105478,18.7446017 C38.5986421,12.9407505 41.476791,9.08616941 46.5133487,6.19584415 C49.3679661,4.55795247 52.4720988,3.65678642 55.718232,3.26074551 C59.6739625,2.77841409 62.8279982,2.76294692 66.1848919,5.01097768 C70.6051671,7.97090519 73.4601902,11.6785482 74.6371722,16.9479681 Z M69.5056769,23.9358717 C70.5917785,23.6358901 69.1977385,20.8827342 68.427284,22.2161669 C68.1497742,22.6968702 68.8902058,24.1047895 69.5056769,23.9358717 Z M67.6848238,18.6143519 C67.7728641,18.973353 68.1185341,19.0836583 68.4325583,19.0405131 C69.182727,18.9371273 68.7125023,18.059976 68.7340052,17.6684125 C68.7741711,16.9194759 68.8407085,15.0292252 68.5619816,14.3474487 C68.0491567,13.0942011 67.5866405,13.3339422 67.2884393,14.5615469 C67.0210725,15.6617509 67.4109655,17.5092635 67.6848238,18.6143519 Z M66.6372652,22.892652 C67.4795315,22.3952604 65.2570196,16.7171816 64.7685376,15.9051553 C62.8770898,12.7604359 62.2652702,18.3363499 61.9751833,19.714149 C61.8498171,20.310856 60.4574,26.4960951 62.3135504,24.5020515 C63.3047144,23.4376661 61.755691,19.900162 64.5567538,20.7227711 C65.540615,21.0117629 64.8289892,20.9287287 65.4314774,21.8315228 C65.6517812,22.1616248 65.8887193,23.3326522 66.6372652,22.892652 Z M60.2947079,21.5987013 C61.0809854,20.2481733 57.6303713,20.8778498 57.2327696,20.9022717 C57.3268957,19.1027888 57.6782457,17.2792911 57.6733771,15.4798082 C57.67216,15.0052104 57.8380978,13.2887618 56.7146704,14.0987529 C56.2606742,14.4264127 56.4168749,15.9283561 56.3787376,16.3789391 C56.2886686,17.436405 55.4313908,21.0858425 56.2708171,21.9381649 C56.8660024,22.5421985 59.9640494,22.1587756 60.2947079,21.5987013 Z M55.4961584,19.1587406 C55.8337431,17.8148148 55.4118876,14.9057989 53.6512301,14.8794474 C53.0382604,14.8705068 53.3156518,15.7104604 53.164165,15.7984555 C52.0992431,16.4200683 51.6357538,16.3414844 51.0047261,17.4454234 C48.5177346,21.7957715 54.0705776,24.8897184 55.4961584,19.1587406 Z M49.4685836,22.9899323 C50.2301124,22.7799045 50.0146773,13.0115738 49.1375194,13.0062824 C47.6286618,12.9977348 49.0750392,17.8462849 48.5033854,18.49672 C48.3321733,18.6916877 47.4769241,18.5109661 47.2529689,18.5520762 C46.1129071,18.7637322 45.3623326,18.6444722 45.0126054,17.9464145 C44.7014213,17.3265067 45.3736926,13.0661159 43.7552917,15.1562188 C43.7698975,15.8937585 43.7816632,16.6317052 43.7901833,17.3692449 C44.1261161,18.0843979 44.0007498,18.5195137 43.4136789,18.6754065 C43.3844673,19.14512 43.8056005,19.5387187 43.8108748,19.6921693 C43.8360292,20.4630855 43.3268557,23.9232538 44.7111585,23.7563712 C45.5960249,23.6493221 45.0316741,20.2746303 45.0280226,19.7255458 C46.1705187,19.7532239 47.3673807,19.8806245 48.5033854,19.7336864 C48.5086597,20.1610687 48.2149214,23.3367225 49.4685836,22.9899323 Z M63.8368644,17 C64.2706568,17.6069046 64.6557203,18.2184508 65,18.8421816 C64.3342161,18.8990426 63.6679025,18.9518422 63,19 C63.2722458,18.332463 63.5439619,17.664926 63.8368644,17 Z M53.9230169,17 C54.0684325,17.4229772 54.1789882,20.2877939 52.5679624,19.9763934 C51.6476608,19.7985469 52.0614978,18.2121289 52.3219511,17.8848372 C52.8722396,17.1947521 53.1949428,17.4368397 53.9230169,17 Z' }))));
+    };
+    Hola.optionValue = 'Hola';
+    return Hola;
+}(React.Component));
+exports.Hola = Hola;
+var Selena = /** @class */ (function (_super) {
+    __extends(Selena, _super);
+    function Selena() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Selena.prototype.render = function () {
+        return (React.createElement("g", { id: 'Clothing/Graphic/Selena', mask: "url(#" + this.props.maskID + ")", strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("g", { transform: 'translate(77.000000, 58.000000)', id: 'Selena' },
+                React.createElement("g", { transform: 'translate(17.000000, 0.000000)' },
+                    React.createElement("path", { d: 'M65.3033729,7.56759412 C65.1470447,8.49857487 63.3805357,12.656817 62.0741755,10.5184706 C61.5650892,9.68550605 62.4755312,7.05707864 62.7589611,6.30931546 C63.3169849,4.836648 63.7329539,4.67144048 65.0219821,3.97805378 C65.1307322,5.16706304 65.4331933,6.37685313 65.3033729,7.56759412 M62.3188632,10.8866375 C62.3487694,10.8987596 62.4772304,11.018942 62.3188632,10.8866375 M62.3110467,10.8804032 C62.3052694,10.8755544 62.3107069,10.8800569 62.3110467,10.8804032 M55.0298897,6.20471867 C55.040085,6.21337734 55.0829054,6.246973 55.0298897,6.20471867 M42.5545574,11.1605979 C42.3475925,12.3804321 42.0797954,13.5995735 41.6509123,14.760875 C41.48167,13.0294864 41.7542249,11.3046783 42.651413,9.81019097 C42.6412176,10.2618275 42.6089325,10.7120786 42.5545574,11.1605979 M42.544702,8.65858718 C42.5406238,8.64334792 42.3859948,8.41891506 42.544702,8.65858718 M25.9083201,18.8030909 C26.0609101,17.2701591 26.6763675,15.7860622 27.8141651,14.7591433 C27.5371923,16.3838571 26.7416175,17.4294787 25.9083201,18.8030909 M75.8371766,5.29694317 C75.8371766,5.93422166 73.7787416,7.63166832 73.2635382,8.10027581 C72.3850415,8.898952 71.4487714,9.53969396 70.1865909,9.35370562 C66.7252801,8.84422918 68.0968903,5.14766761 67.5456634,2.87251415 C67.1120225,1.08501726 66.6671667,1.75900853 65.4641191,1.64644576 C64.3456926,1.54219531 63.9460361,0.990464532 62.7824103,1.83312679 C60.685573,3.35151205 59.0159196,5.32915344 58.1231495,7.8135005 C57.7992782,6.11813191 56.8776214,3.30960407 54.6706746,3.71967892 C53.0387439,4.02273255 51.6868446,6.64596475 51.0078363,7.96277605 C50.95618,6.76545446 50.3403828,4.88721467 48.8328349,5.74476985 C47.7973303,6.3339061 47.8418499,9.12615564 47.615174,10.1548062 C47.1499276,12.2664839 46.236427,17.7723622 42.9708663,17.056463 C43.999574,15.1377006 46.2510403,9.08632573 44.3207265,7.1194211 C41.6091115,4.35730375 39.5459188,11.2748924 39.4354695,12.9584852 C39.355946,14.1644655 40.2405598,16.9030312 39.7637588,17.6511408 C39.1788873,18.568614 37.3362533,18.9641423 36.4608152,18.2922291 C35.0562401,17.2143972 35.6101858,15.4622277 35.9313383,14.093118 C36.3527448,12.2990405 36.5512137,10.495958 36.6650614,8.65616275 C36.7503623,7.27631629 37.951031,1.10787617 35.6370334,1.02406019 C33.5415555,0.948902892 33.3281335,6.16211798 33.1786022,7.58664321 C32.9944067,9.33812 32.8825981,11.1121094 32.94377,12.8746693 C33.0056216,14.6573173 33.3376491,15.8449412 32.6467463,17.5181435 C31.9065662,19.3108356 28.3834038,24.6889119 26.2743321,21.1180743 C28.5142437,20.1354878 31.1850774,15.5997275 29.9833892,13.0506135 C28.317474,9.51683506 24.5679755,14.9018383 24.024565,16.7073452 C23.1474277,19.6222016 23.5328108,23.4292478 26.8877504,24.3782386 C30.3810066,25.366713 33.0780083,22.0916557 34.309263,19.1975801 C35.3107832,20.7859275 37.1544368,21.1842266 38.8580746,20.7031506 C39.5350438,20.5116207 40.1861848,20.1822447 40.7496461,19.7555452 C41.8198148,18.9457859 41.1934823,19.2471078 42.3292409,19.2142048 C45.6264071,19.1196521 47.4252012,18.0612156 48.660534,14.6690931 C48.6459207,15.6031909 49.0041163,17.0287552 50.2588202,16.5178934 C51.2334927,16.1209797 51.2266958,14.5083881 51.4074928,13.6480621 C51.9774112,10.935126 52.8729,8.10651006 55.0057608,6.22584583 C56.8466956,8.22807786 55.4856205,11.6534497 56.6968244,13.7862546 C58.5635873,17.0737803 59.5035957,11.2537653 59.7962014,10.1319473 C59.8526155,15.0140547 65.6574903,13.2158211 66.9135536,9.97505214 C70.2130987,13.4901279 77.1479547,10.3238236 75.8371766,5.29694317', id: 'Bom-Bom', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M69.433817,15.3488372 C65.8038135,15.3488372 61.8287631,16.3747039 58.3068219,17.1662556 C54.7602589,17.9637144 51.2314783,18.9518414 47.8046046,20.1368717 C43.9335128,21.4748303 39.9926593,22.6897243 36.2145831,24.2580599 C32.9385178,25.6183343 28.7066484,26.6107275 26.7027087,29.6738881 C26.6986051,29.6824206 28.8051356,29.5856097 28.9754363,29.5573869 C30.0242559,29.3834556 30.9267127,29.0139335 31.8924339,28.6010927 C33.6392127,27.8548288 35.3740227,27.0823111 37.115672,26.3248894 C41.0202768,24.6265975 45.0951823,23.2295678 49.1044296,21.7708418 C53.1003402,20.3176946 57.1991835,19.0860638 61.3588973,18.1455219 C64.7498643,17.3792395 68.5409353,17.2322183 71.6624305,15.8729284 C71.5444511,15.9172317 71.6210523,15.887368 71.8918919,15.7816965 C71.813239,15.8197645 69.6708017,15.3488372 69.433817,15.3488372', id: 'Bidi', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M22.1170349,20.8250383 C19.8478706,19.8267659 16.6395075,20.267131 14.2823358,20.5862701 C12.1385566,20.8762747 8.78577979,21.5209156 7.44867865,21.6937129 C6.34297926,21.8346967 3.04321074,22.7348497 2.4393915,21.4968044 C1.79003946,20.1656628 5.15878677,16.0935417 5.89512684,15.1341152 C9.20984643,10.8135143 13.1946457,6.01370248 17.9749097,3.21110531 C17.5345328,5.16177188 17.1498826,7.12884748 16.7479027,9.08721625 C16.5824216,9.89460802 15.79851,14.2513757 17.2338124,14.5946261 C17.8233602,14.735275 19.0058537,11.8121216 19.104055,11.5505816 C19.9270433,9.36181652 20.1163103,6.84118695 20.4951839,4.54927932 C20.7119744,3.23789558 21.6953468,0.499260193 19.8009787,0.0471743805 C18.1723317,-0.341619419 15.9646707,1.77447706 14.8776601,2.66558843 C11.5962407,5.35767573 8.75146029,8.61302846 6.0905101,11.8864646 C4.78025293,13.4985691 3.4761121,15.1200503 2.37686886,16.8831849 C1.47300888,18.3332083 -0.712565331,21.3735691 0.232070287,23.1651685 C1.92969602,26.3860287 10.0715716,23.5626691 12.663543,23.133355 C14.708781,22.7941232 16.8162019,22.4729748 18.8913421,22.7566168 C21.0534703,23.0519796 20.9484731,24.0274803 20.2298024,25.953031 C18.7520254,29.9126329 15.4539558,33.3136578 12.5058772,36.2726431 C11.2071731,37.5759898 6.1251694,43.6918736 4.84549395,40.3641872 C3.97595347,38.1030884 4.74525384,35.3289559 5.74561617,33.2503658 C6.21419621,32.2765394 6.8346655,31.3887768 7.32329357,30.4256666 C7.45649398,30.163122 8.12453486,28.0011471 8.27030776,27.9529247 C4.4003599,29.303824 2.15328244,34.538308 1.93751135,38.2397187 C1.83591206,39.9810863 2.07376995,42.5640033 3.73741598,43.6084889 C5.40174162,44.6533095 6.96378836,43.3814414 8.28661802,42.4230195 C11.9289019,39.7838429 15.1780407,36.4246779 18.1519439,33.0879497 C19.7778725,31.2635323 26.6054133,22.8014905 22.1170349,20.8250383', id: 'Bidi', fill: '#FFFFFF' })))));
+    };
+    Selena.optionValue = 'Selena';
+    return Selena;
+}(React.Component));
+exports.Selena = Selena;
+var Pizza = /** @class */ (function (_super) {
+    __extends(Pizza, _super);
+    function Pizza() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Pizza.prototype.render = function () {
+        return (React.createElement("g", { id: 'Clothing/Graphic/Pizza', mask: "url(#" + this.props.maskID + ")", strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("g", { transform: 'translate(77.000000, 58.000000)', id: 'Group-2' },
+                React.createElement("g", { transform: 'translate(35.000000, 1.000000)' },
+                    React.createElement("path", { d: 'M30.9332298,24.3911229 C26.8510636,25.7713262 22.3826909,27.7147062 20.0279438,31.464875 C18.1805823,34.4072634 18.056518,31.0097105 15.4771364,32.0578917 C12.9702973,33.0766532 13.6557418,37.2811459 12.7452506,39.3594362 C12.0367243,38.1679392 11.7020395,36.8427927 10.8096839,35.755105 C11.5033719,35.309607 12.1459503,34.7115469 12.6240715,34.0306915 C12.7802853,33.7116981 7.83173048,34.3791045 7.54774295,34.4602188 C6.13687312,34.8620076 4.80843799,35.231855 3.46021853,35.8900153 C3.8167486,35.3734898 4.16627171,34.8531817 4.51043656,34.3282505 C4.82039102,33.8562748 5.1253994,33.3800962 5.42463735,32.9009757 C5.63196061,32.2209608 6.00126805,32.2188594 6.53255966,32.8950918 C7.28147888,32.931236 7.71055147,33.2519105 8.49450544,33.0724504 C11.4098085,32.4054642 12.3380232,26.8489271 8.74469474,27.0851251 C10.3237313,24.2158656 11.7251212,21.3024766 12.9975007,18.2831768 C13.4999402,22.5742474 19.0774717,21.0961186 20.7166857,18.8076877 C22.8571026,15.8190684 20.1132637,10.1456931 16.2334747,10.6962614 C16.8142272,9.32068116 17.4036352,7.93375334 17.8825808,6.5182464 C18.9752527,8.1287638 20.8844403,8.90880562 22.421023,9.97463863 C24.031797,11.0917459 25.3940304,12.414791 26.5839752,13.9807586 C28.9704596,17.1210994 30.3767956,20.9881063 32.7987269,24.0334636 C32.1610946,24.0675064 31.539537,24.1868662 30.9332298,24.3911229 M39.9388082,20.0029673 C39.306534,14.2455357 34.7895249,8.40194655 30.4996233,4.82661475 C27.9499181,2.7020935 20.2587609,-2.55814545 17.1930146,1.48706068 C19.664819,2.55835735 22.3921709,2.81640998 24.8425422,3.97596569 C28.1630118,5.5482375 30.7646508,8.13506801 33.0114085,11.0312255 C36.1484608,15.075591 40.9816071,23.3139423 33.485408,25.4170292 C34.0030979,25.0791231 34.3035723,24.7080149 34.7132728,24.1086939 C33.706333,23.8762784 34.1131482,22.231298 33.7590912,21.1570594 C33.3473298,19.9063026 32.549362,18.6904293 31.874634,17.5745828 C30.8042195,15.803518 29.6278764,14.0408588 28.3707472,12.4038637 C26.692789,10.2179814 24.685092,8.49735037 22.3938196,7.00829423 C21.4874501,6.41948033 20.6190006,5.89749114 19.5774382,5.59320758 C18.2279822,5.19898385 18.6698322,5.67936522 18.3005247,4.44668058 C18.0692954,3.67420382 18.277443,2.68402141 18.0548693,1.85480669 C16.0817949,3.51323614 15.4400408,5.90967929 14.5555165,8.23635577 C13.5353871,10.9202712 12.4328231,13.5714048 11.3591111,16.2330453 C8.72367389,22.767997 5.32530354,28.6283975 1.46777192,34.479972 C0.796341323,35.4991538 -0.697375374,37.4299255 0.377573066,38.6537842 C1.33876162,39.7486166 2.7084141,38.9597489 3.76399039,38.5150914 C5.20041497,37.9107271 7.14917119,36.3506434 8.69894348,37.1680903 C10.6971605,38.2221554 9.75287108,42.1522045 12.9130052,41.9954397 C16.0265636,41.8407762 15.4404529,36.7154475 16.4395615,34.6775042 C18.7514425,36.3628316 20.615291,35.3171721 22.0187417,33.0665665 C23.6451783,30.4578814 25.7942508,29.4101204 28.5323192,28.1291035 C29.6521946,27.6050129 31.5663282,26.1899262 32.7327792,26.0138284 C33.6980895,25.8688314 34.6254798,26.8972594 35.915995,26.8506082 C39.0138909,26.7375526 40.3077034,22.5977832 39.9388082,20.0029673', id: 'Fill-29', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M18.5372079,22.8336349 C16.1119296,22.3885123 12.7302873,22.7596628 12.5083803,25.9869094 C12.3721811,27.9648021 13.9174686,29.8351772 15.5900451,30.6510203 C20.7121513,33.1501581 24.6988403,23.9625691 18.5372079,22.8336349', id: 'Fill-31', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M28.3362306,19.157604 C27.6856351,18.4518413 26.6326311,17.918164 25.6605301,18.1654572 C25.9719227,17.9508815 26.2293799,17.5642204 26.5251817,17.3262751 C23.3686979,15.0403008 21.3853086,20.8049502 23.1786599,23.0743534 C25.8964974,26.5139375 31.2158743,22.3078297 28.3362306,19.157604', id: 'Fill-33', fill: '#FFFFFF' })))));
+    };
+    Pizza.optionValue = 'Pizza';
+    return Pizza;
+}(React.Component));
+exports.Pizza = Pizza;
+var Resist = /** @class */ (function (_super) {
+    __extends(Resist, _super);
+    function Resist() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Resist.prototype.render = function () {
+        return (React.createElement("g", { id: 'Clothing/Graphic/Resist', mask: "url(#" + this.props.maskID + ")", strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("g", { transform: 'translate(77.000000, 58.000000)', id: 'Resist' },
+                React.createElement("g", { transform: 'translate(3.000000, 9.000000)' },
+                    React.createElement("path", { d: 'M102.565245,21.0710109 C99.4833509,20.4054313 97.3728781,24.6059197 100.65303,25.85541 C103.46796,26.9271503 105.497722,21.7103865 102.565245,21.0710109', id: '!', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M101.191001,18 C104.847558,18 103.499462,12.0185653 103.512139,10.034892 C103.52569,7.89835492 105.057378,1.43936922 102.622588,0.300988793 C98.4060734,-1.67043963 99.5622709,6.62567562 99.5876242,8.26886181 C99.6156003,10.0850565 99.7546063,11.9885455 99.3594446,13.7770905 C99.009744,15.3574722 98.2303489,18 101.191001,18', id: 'H', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M96.057932,1.97392328 C94.9756601,1.35173361 93.2567577,1.65427333 92.0711316,1.60022061 C90.7220251,1.53916824 89.3807782,1.40539746 88.0356015,1.30662485 C85.8592683,1.14718875 83.080101,0.743543202 80.9175222,1.23857286 C79.6922049,1.51933595 78.5800664,2.46389764 79.1565707,3.84671419 C79.777482,5.33646958 81.4602301,4.95187859 82.7370279,4.87682696 C83.3217848,4.84221766 84.7703158,4.58750876 85.3421043,4.78816493 C86.3390991,5.13853549 85.9154647,4.67967061 86.1430012,5.85522022 C86.491969,7.66229234 86.2825097,9.85512207 86.2675764,11.6929148 C86.2420326,14.8668599 86.2322081,18.0567485 86.1650082,21.2287493 C86.1386784,22.4645735 85.7244756,23.8606116 86.9218911,24.6768466 C87.9196719,25.3569777 89.1379155,24.9023904 89.6550795,23.8835548 C90.1694927,22.8705522 89.6806234,20.8169375 89.6259989,19.6876632 C89.5599779,18.3406226 89.4900272,17.0122476 89.5293254,15.6628738 C89.6330726,12.0775058 89.8110933,8.49563763 89.8971563,4.90910305 C90.8399197,4.95537841 91.8188373,4.92737987 92.7525621,5.05842857 C93.4359574,5.15409023 94.4184119,5.59351169 95.0754775,5.55890239 C96.9743656,5.45818543 97.7689748,2.97175996 96.057932,1.97392328', id: 'C', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M67.7216119,8.81264097 C67.7100258,8.75972031 67.6397369,8.1691564 67.7216119,8.81264097 M67.6853088,8.53730013 C67.6887847,8.56222653 67.685695,8.5449698 67.6853088,8.53730013 M69.1169633,5.42725256 C72.533315,1.44593148 73.7004204,9.77441647 76.3625176,9.42199554 C80.623109,8.85827545 75.4217272,2.46944776 73.6942412,1.64649312 C70.1786354,-0.0289443454 67.0886252,1.72587411 65.4167525,4.9126183 C63.3188978,8.91234656 64.6466637,11.6208874 68.6751471,13.3572987 C70.1461943,13.9915796 75.714469,15.8848355 74.2051877,18.3157346 C73.4451402,19.5398125 70.6791544,19.6445033 69.5047111,19.402142 C67.1492591,18.916269 67.5161519,17.3159942 66.3699015,15.8288469 C65.3371947,14.4885737 63.3397528,14.8820273 63.028087,16.6100019 C62.7828481,17.9675319 64.198282,20.0348891 65.1433208,20.9897619 C67.3759602,23.2457927 71.1831493,23.4271802 74.0298516,22.3998291 C78.4155727,20.816811 78.9473743,16.6909168 75.8357368,13.4953526 C74.0870096,11.6995014 71.9026455,11.154572 69.7225296,10.0773681 C67.0781977,8.7712248 67.5725376,7.68673472 69.1169633,5.42725256', id: 'A', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M58.749962,20.5676943 C58.1855671,15.7434329 58.0538346,10.8505093 57.9696387,6.00460433 C57.9426476,4.45075032 58.6758373,0.798596322 56.5169562,0.139962235 C53.6023258,-0.749287073 53.9890632,2.83233897 54.0502966,4.30372379 C54.255348,9.21679823 54.8922562,14.0929294 55.1210758,19.0000333 C55.193992,20.5568726 54.6924419,23.5739018 56.9520358,23.9463193 C59.7027058,24.4000865 58.9598476,21.8648117 58.749962,20.5676943', id: 'E', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M49.4716454,4.67909741 C47.1120678,1.521124 42.3181606,1.01110068 39.382093,3.92183601 C37.3101733,5.97595969 36.00495,10.8410892 37.9661116,13.3252251 C40.0904751,16.016404 45.3211527,13.6574039 46.6913436,16.7080638 C48.3726748,20.4511421 43.9611374,21.8560762 41.6168232,19.3708027 C40.7738094,18.4774087 40.9581453,16.917382 39.7163241,16.3637507 C37.9539791,15.5788077 36.853443,17.2916519 37.2001979,18.7227508 C38.0479082,22.2235205 41.8524287,24.1130716 45.3011927,23.9947614 C49.0689244,23.8650751 50.7028996,21.0184245 50.4641631,17.5957699 C50.1342371,12.8603265 46.4792204,12.1186123 42.4747091,11.597213 C40.7761576,11.3761397 40.5534673,11.3966165 40.6583549,9.64547322 C40.7855505,7.52650643 42.0277631,5.07763608 44.6491681,5.58159221 C46.7551372,5.98657727 46.942604,9.15327227 49.1037564,9.30040167 C52.5998763,9.53853896 50.3604497,5.86712943 49.4716454,4.67909741', id: 'P', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M31.7209696,20.4381695 C30.3835461,20.7580967 28.7579173,20.5355712 27.3944988,20.5112208 C26.3407598,20.4924897 22.8201338,20.9379153 22.1329619,20.2148947 C21.3727026,19.4150766 21.6202201,16.9680453 21.5881973,15.9288437 C21.5422351,14.4753101 21.1839563,14.2599024 22.4595946,13.9298603 C23.2085518,13.7361807 24.3674009,13.8332078 25.1415996,13.7976187 C26.6572206,13.727939 28.606845,14.008531 30.0716062,13.7099572 C31.4414292,13.4304891 32.5739067,11.958599 31.3223797,10.7058628 C30.4355361,9.81763391 28.7797682,10.2949024 27.6909924,10.3200021 C25.6573553,10.3664552 23.6222112,10.3555912 21.5881973,10.3915549 C21.5964855,8.82376157 21.5448723,7.2454788 21.6669357,5.68105705 C24.5143291,5.82154032 27.4788884,6.56329201 30.3255283,6.42655496 C31.766555,6.35724988 33.3654353,5.43530497 32.6368221,3.69630934 C32.0121888,2.20606276 30.1149312,2.40985716 28.792954,2.35066687 C27.1398233,2.27611708 25.4848088,2.23790563 23.8313013,2.18096308 C22.6068996,2.13900541 20.8260543,1.73628668 19.6721027,2.28847961 C17.3095724,3.41833976 18.121445,7.29867513 18.1873743,9.39955568 C18.2706336,12.0657409 18.2721406,14.6678658 18.3644416,17.3561538 C18.4484544,19.7885748 18.3271445,22.9972128 21.2159792,23.6808981 C24.1051906,24.364958 27.4611816,23.7142395 30.4084109,23.8565959 C31.6166129,23.9150369 33.2693669,24.2671816 33.8631075,22.8608504 C34.4319834,21.512211 33.1326106,20.086774 31.7209696,20.4381695', id: 'M', fill: '#FFFFFF' }),
+                    React.createElement("path", { d: 'M8.41021607,5.87934286 C10.7314099,6.38056324 11.3520318,8.89406466 11.4306011,11.0286326 C11.4842397,12.4898438 11.613048,12.4018284 10.4273316,12.768689 C9.23708235,13.1371074 7.50704692,12.9377097 6.28808963,12.8851342 C3.74516418,12.7756991 4.0526421,12.6070678 4.00353629,9.93973422 C3.99220418,9.31505862 3.52947636,6.4362544 3.89625898,6.02967003 C4.37220759,5.5015777 7.73482232,5.8267673 8.41021607,5.87934286 M13.4870013,20.7181143 C12.1966517,19.2140637 10.9010138,17.7773878 9.45277018,16.4318428 C11.6107816,16.3722571 13.9557729,15.9594416 14.7229567,13.6130136 C15.3711534,11.6307201 14.8079476,8.6132722 14.05474,6.74080322 C13.0612917,4.27092005 10.9928039,2.62238402 8.42003723,2.26253349 C6.62389782,2.01172858 2.14242611,1.58956627 0.799948834,2.97327723 C-0.664537495,4.48161175 0.351952758,8.62222952 0.4422319,10.4701632 C0.602014649,13.7411422 0.486049391,16.987586 0.285471047,20.2550599 C0.220500284,21.3096868 -0.296621662,23.0423437 0.243919977,23.9918195 C0.843766325,25.0456674 2.30296434,25.3089347 3.21255502,24.5288691 C4.19693763,23.6845445 3.74176455,22.6513373 3.68132663,21.5678912 C3.58802559,19.8917044 3.75574082,18.1644997 3.85546339,16.4937651 C5.46348977,17.806207 7.10551249,19.0851563 8.61683821,20.5163799 C10.1096548,21.9300785 11.1809169,23.7184265 12.6076296,25.143419 C13.618076,26.1528699 15.4266807,26.5676327 15.9381366,24.6947742 C16.377067,23.0871303 14.3667507,21.7435326 13.4870013,20.7181143', id: 'I', fill: '#FFFFFF' })))));
+    };
+    Resist.optionValue = 'Resist';
+    return Resist;
+}(React.Component));
+exports.Resist = Resist;
+var Bear = /** @class */ (function (_super) {
+    __extends(Bear, _super);
+    function Bear() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    Bear.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, path1 = _a.path1;
+        return (React.createElement("g", { id: 'Clothing/Graphic/Bear', mask: "url(#" + this.props.maskID + ")", strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("polygon", { id: path1, points: '47.8916289 0.430054064 47.8916289 41.9204613 0.45345556 41.9204613 0.45345556 0.430054064 47.8916289 0.430054064' })),
+            React.createElement("g", { transform: 'translate(77.000000, 58.000000)', id: 'Group-76' },
+                React.createElement("g", { transform: 'translate(31.000000, 1.000000)' },
+                    React.createElement("mask", { id: mask1, fill: 'white' },
+                        React.createElement("use", { xlinkHref: '#' + path1 })),
+                    React.createElement("path", { d: 'M34.4465814,31.5861741 C33.968066,34.4016565 30.3675711,38.9307388 27.2995299,35.97048 C23.8326433,32.6262918 31.5245196,31.1602447 28.7810969,28.3763859 C27.5974268,27.1761741 24.3685608,27.83928 22.7791175,27.96528 C21.289633,28.0833741 18.9133856,28.4198682 19.4834474,30.5900329 C19.9159423,32.2398918 21.1926433,31.5342918 21.8715711,32.4815153 C22.4069938,33.2301035 22.1798598,35.9887624 21.3826639,36.7492094 C20.3796124,37.7053271 19.193468,37.4123153 17.7975093,36.7996094 C14.6057567,35.39928 13.1212206,31.4868565 15.2228289,28.5829271 C19.3780454,22.8417741 35.2897979,21.5244565 34.4465814,31.5861741 M14.9853031,14.7244094 C15.9695505,14.2811859 17.132932,14.5213271 17.7173443,15.5110447 C18.5189938,16.8669035 17.3595711,18.6842682 15.7424165,18.4668565 C14.0347052,18.2365976 13.1726845,15.5481035 14.9853031,14.7244094 M32.9472,16.3787153 C32.0911175,19.3854212 27.3109113,16.0012094 30.0112825,14.08848 C31.5626227,12.9900565 33.4583753,14.5801271 32.9472,16.3787153 M47.8267052,23.16888 C47.5911588,20.7887153 46.9270763,18.5231859 45.7389526,16.4385035 C45.1164371,15.3460094 44.3464577,14.3276329 43.5492619,13.35768 C43.2483959,12.9930212 42.6432,12.34968 42.5264165,12.1446212 C41.8173031,10.90488 41.888066,11.7834212 42.2789938,10.3598682 C42.8950763,8.11657412 44.2262103,6.28043294 43.1627876,3.87062118 C42.1735918,1.62930353 39.5078598,0.576832941 37.1791175,0.443915294 C36.0914474,0.382150588 35.0017979,0.525938824 33.9720247,0.892574118 C32.9368082,1.26069176 31.9708701,2.53255059 31.0717361,2.79393882 C30.3740041,2.99702118 28.3872,2.33391529 27.6305814,2.28549176 C26.2356124,2.19605647 24.8332206,2.23558588 23.4387464,2.31859765 C21.8087258,2.41544471 18.0632412,3.58205647 16.5257567,3.19565647 C15.5108289,2.94069176 14.3172619,1.41485647 13.1449732,1.03191529 C11.852932,0.610432941 10.4673649,0.467632941 9.17829278,0.954338824 C6.89260206,1.81805647 5.17845773,4.50605647 5.12501443,6.89560941 C5.09680825,8.15066824 5.78018969,9.01092706 5.91528247,10.1469035 C6.11816907,11.8619859 6.35223093,10.5026682 5.42835464,11.8718682 C4.9577567,12.5690682 4.13284948,13.1822682 3.60385979,13.8537741 C0.778787629,17.4405741 -0.278696907,22.73208 0.974746392,27.0733976 C4.13284948,38.0131624 14.6423753,42.4676329 25.4136742,41.86728 C34.6648082,41.3509271 48.9782103,34.1491624 47.8267052,23.16888', id: 'Fill-74', fill: '#FFFFFF', mask: "url(#" + mask1 + ")" })))));
+    };
+    Bear.optionValue = 'Bear';
+    return Bear;
+}(React.Component));
+exports.Bear = Bear;
+var Graphics = /** @class */ (function (_super) {
+    __extends(Graphics, _super);
+    function Graphics() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Graphics.prototype.render = function () {
+        return (React.createElement(options_1.Selector, { option: options_1.GraphicOption, defaultOption: Skull },
+            React.createElement(Bat, { maskID: this.props.maskID }),
+            React.createElement(Cumbia, { maskID: this.props.maskID }),
+            React.createElement(Deer, { maskID: this.props.maskID }),
+            React.createElement(Diamond, { maskID: this.props.maskID }),
+            React.createElement(Hola, { maskID: this.props.maskID }),
+            React.createElement(Pizza, { maskID: this.props.maskID }),
+            React.createElement(Resist, { maskID: this.props.maskID }),
+            React.createElement(Selena, { maskID: this.props.maskID }),
+            React.createElement(Bear, { maskID: this.props.maskID }),
+            React.createElement(SkullOutline, { maskID: this.props.maskID }),
+            React.createElement(Skull, { maskID: this.props.maskID })));
+    };
+    return Graphics;
+}(React.Component));
+exports.default = Graphics;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Hoodie.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Hoodie.d.ts
new file mode 100644
index 000000000..bd02b2dff
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Hoodie.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class Hoodie extends React.Component {
+    static optionValue: string;
+    private path1;
+    private mask1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Hoodie.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Hoodie.js
new file mode 100644
index 000000000..693cab6d2
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Hoodie.js
@@ -0,0 +1,42 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Colors_1 = require("./Colors");
+var Hoodie = /** @class */ (function (_super) {
+    __extends(Hoodie, _super);
+    function Hoodie() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        return _this;
+    }
+    Hoodie.prototype.render = function () {
+        var _a = this, path1 = _a.path1, mask1 = _a.mask1;
+        return (React.createElement("g", { id: 'Clothing/Hoodie', transform: 'translate(0.000000, 170.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M108,13.0708856 C90.0813006,15.075938 76.2798424,20.5518341 76.004203,34.6449676 C50.1464329,45.5680933 32,71.1646257 32,100.999485 L32,100.999485 L32,110 L232,110 L232,100.999485 C232,71.1646257 213.853567,45.5680933 187.995797,34.6449832 C187.720158,20.5518341 173.918699,15.075938 156,13.0708856 L156,32 L156,32 C156,45.254834 145.254834,56 132,56 L132,56 C118.745166,56 108,45.254834 108,32 L108,13.0708856 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("use", { id: 'Hoodie', fill: '#B7C1DB', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+            React.createElement(Colors_1.default, { maskID: mask1 }),
+            React.createElement("path", { d: 'M102,61.7390531 L102,110 L95,110 L95,58.1502625 C97.2037542,59.4600576 99.5467694,60.6607878 102,61.7390531 Z M169,58.1502625 L169,98.5 C169,100.432997 167.432997,102 165.5,102 C163.567003,102 162,100.432997 162,98.5 L162,61.7390531 C164.453231,60.6607878 166.796246,59.4600576 169,58.1502625 Z', id: 'Straps', fill: '#F4F4F4', fillRule: 'evenodd', mask: "url(#" + mask1 + ")" }),
+            React.createElement("path", { d: 'M90.9601329,12.7243537 C75.9093095,15.5711782 65.5,21.2428847 65.5,32.3076923 C65.5,52.0200095 98.5376807,68 132,68 C165.462319,68 198.5,52.0200095 198.5,32.3076923 C198.5,21.2428847 188.09069,15.5711782 173.039867,12.7243537 C182.124921,16.0744598 188,21.7060546 188,31.0769231 C188,51.4689754 160.178795,68 132,68 C103.821205,68 76,51.4689754 76,31.0769231 C76,21.7060546 81.8750795,16.0744598 90.9601329,12.7243537 Z', id: 'Shadow', fillOpacity: '0.16', fill: '#000000', fillRule: 'evenodd', mask: "url(#" + mask1 + ")" })));
+    };
+    Hoodie.optionValue = 'Hoodie';
+    return Hoodie;
+}(React.Component));
+exports.default = Hoodie;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Overall.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Overall.d.ts
new file mode 100644
index 000000000..269160f89
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Overall.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class Overall extends React.Component {
+    static optionValue: string;
+    private path1;
+    private mask1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Overall.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Overall.js
new file mode 100644
index 000000000..10c1edc41
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/Overall.js
@@ -0,0 +1,42 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Colors_1 = require("./Colors");
+var Overall = /** @class */ (function (_super) {
+    __extends(Overall, _super);
+    function Overall() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        return _this;
+    }
+    Overall.prototype.render = function () {
+        var _a = this, path1 = _a.path1, mask1 = _a.mask1;
+        return (React.createElement("g", { id: 'Clothing/Overall', transform: 'translate(0.000000, 170.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M94,29.6883435 L94,74 L170,74 L170,29.6883435 C179.362956,30.9893126 188.149952,34.0907916 196.00002,38.6318143 L196,110 L187,110 L77,110 L68,110 L68,38.6318027 C75.8500482,34.0907916 84.6370437,30.9893126 94,29.6883435 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("use", { id: 'Overall', fill: '#B7C1DB', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+            React.createElement(Colors_1.default, { maskID: mask1 }),
+            React.createElement("circle", { id: 'Button', fill: '#F4F4F4', fillRule: 'evenodd', cx: '81', cy: '83', r: '5' }),
+            React.createElement("circle", { id: 'Button', fill: '#F4F4F4', fillRule: 'evenodd', cx: '183', cy: '83', r: '5' })));
+    };
+    Overall.optionValue = 'Overall';
+    return Overall;
+}(React.Component));
+exports.default = Overall;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtCrewNeck.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtCrewNeck.d.ts
new file mode 100644
index 000000000..4793b46ae
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtCrewNeck.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class ShirtCrewNeck extends React.Component {
+    static optionValue: string;
+    private path1;
+    private mask1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtCrewNeck.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtCrewNeck.js
new file mode 100644
index 000000000..58f84daf7
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtCrewNeck.js
@@ -0,0 +1,43 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Colors_1 = require("./Colors");
+var ShirtCrewNeck = /** @class */ (function (_super) {
+    __extends(ShirtCrewNeck, _super);
+    function ShirtCrewNeck() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        return _this;
+    }
+    ShirtCrewNeck.prototype.render = function () {
+        var _a = this, path1 = _a.path1, mask1 = _a.mask1;
+        return (React.createElement("g", { id: 'Clothing/Shirt-Crew-Neck', transform: 'translate(0.000000, 170.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M165.960472,29.2949161 C202.936473,32.3249982 232,63.2942856 232,101.051724 L232,110 L32,110 L32,101.051724 C32,62.9525631 61.591985,31.7649812 99.0454063,29.2195264 C99.0152598,29.5931145 99,29.9692272 99,30.3476251 C99,42.2107177 113.998461,51.8276544 132.5,51.8276544 C151.001539,51.8276544 166,42.2107177 166,30.3476251 C166,29.9946691 165.986723,29.6437014 165.960472,29.2949161 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("use", { id: 'Clothes', fill: '#E6E6E6', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+            React.createElement(Colors_1.default, { maskID: mask1 }),
+            React.createElement("g", { id: 'Shadowy', opacity: '0.599999964', strokeWidth: '1', fillRule: 'evenodd', mask: "url(#" + mask1 + ")", fillOpacity: '0.16', fill: '#000000' },
+                React.createElement("g", { transform: 'translate(92.000000, 4.000000)', id: 'Hola-\uD83D\uDC4B\uD83C\uDFFC' },
+                    React.createElement("ellipse", { cx: '40.5', cy: '27.8476251', rx: '39.6351047', ry: '26.9138272' })))));
+    };
+    ShirtCrewNeck.optionValue = 'ShirtCrewNeck';
+    return ShirtCrewNeck;
+}(React.Component));
+exports.default = ShirtCrewNeck;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtScoopNeck.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtScoopNeck.d.ts
new file mode 100644
index 000000000..ae3363a4b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtScoopNeck.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class ShirtScoopNeck extends React.Component {
+    static optionValue: string;
+    private path1;
+    private mask1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtScoopNeck.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtScoopNeck.js
new file mode 100644
index 000000000..81e9f30a9
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtScoopNeck.js
@@ -0,0 +1,40 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Colors_1 = require("./Colors");
+var ShirtScoopNeck = /** @class */ (function (_super) {
+    __extends(ShirtScoopNeck, _super);
+    function ShirtScoopNeck() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        return _this;
+    }
+    ShirtScoopNeck.prototype.render = function () {
+        var _a = this, path1 = _a.path1, mask1 = _a.mask1;
+        return (React.createElement("g", { id: 'Clothing/Shirt-Scoop-Neck', transform: 'translate(0.000000, 170.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M181.544255,32.3304167 C210.784209,41.4878872 232,68.7921987 232,101.051724 L232,110 L32,110 L32,101.051724 C32,68.3969699 53.7388273,40.8195914 83.5340368,32.0020332 C83.182234,33.4201865 83,34.8712315 83,36.3476251 C83,52.6289957 105.161905,65.8276544 132.5,65.8276544 C159.838095,65.8276544 182,52.6289957 182,36.3476251 C182,34.9849859 181.844766,33.6439396 181.544255,32.3304167 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("use", { id: 'Clothes', fill: '#E6E6E6', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+            React.createElement(Colors_1.default, { maskID: mask1 })));
+    };
+    ShirtScoopNeck.optionValue = 'ShirtScoopNeck';
+    return ShirtScoopNeck;
+}(React.Component));
+exports.default = ShirtScoopNeck;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtVNeck.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtVNeck.d.ts
new file mode 100644
index 000000000..5e6029d42
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtVNeck.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class ShirtVNeck extends React.Component {
+    static optionValue: string;
+    private path1;
+    private mask1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtVNeck.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtVNeck.js
new file mode 100644
index 000000000..d2292e9f6
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/ShirtVNeck.js
@@ -0,0 +1,40 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Colors_1 = require("./Colors");
+var ShirtVNeck = /** @class */ (function (_super) {
+    __extends(ShirtVNeck, _super);
+    function ShirtVNeck() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        return _this;
+    }
+    ShirtVNeck.prototype.render = function () {
+        var _a = this, path1 = _a.path1, mask1 = _a.mask1;
+        return (React.createElement("g", { id: 'Clothing/Shirt-V-Neck', transform: 'translate(0.000000, 170.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M171.319631,29.9364358 C205.706337,35.3665707 232,65.13854 232,101.051724 L232,110 L32,110 L32,101.051724 C32,65.1380521 58.2943778,35.3657617 92.6817711,29.9362145 C93.5835973,35.0053598 96.116393,39.8238432 100.236125,43.5389794 L100.236125,43.5389794 L129.321203,69.7676333 C130.843316,71.1402598 133.156684,71.1402598 134.678797,69.7676333 L134.678797,69.7676333 L163.763875,43.5389794 C164.189462,43.1551884 164.601167,42.7562772 164.998197,42.3430127 C168.414164,38.7873666 170.517305,34.4520434 171.319628,29.9364354 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("use", { id: 'Clothes', fill: '#E6E6E6', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+            React.createElement(Colors_1.default, { maskID: mask1 })));
+    };
+    ShirtVNeck.optionValue = 'ShirtVNeck';
+    return ShirtVNeck;
+}(React.Component));
+exports.default = ShirtVNeck;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/index.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/index.d.ts
new file mode 100644
index 000000000..6428fead0
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/index.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+export default class Clothes extends React.Component {
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/index.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/index.js
new file mode 100644
index 000000000..2f2d9d893
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/clothes/index.js
@@ -0,0 +1,46 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var BlazerShirt_1 = require("./BlazerShirt");
+var BlazerSweater_1 = require("./BlazerSweater");
+var CollarSweater_1 = require("./CollarSweater");
+var GraphicShirt_1 = require("./GraphicShirt");
+var Hoodie_1 = require("./Hoodie");
+var Overall_1 = require("./Overall");
+var ShirtCrewNeck_1 = require("./ShirtCrewNeck");
+var ShirtScoopNeck_1 = require("./ShirtScoopNeck");
+var ShirtVNeck_1 = require("./ShirtVNeck");
+var options_1 = require("../../options");
+var Clothes = /** @class */ (function (_super) {
+    __extends(Clothes, _super);
+    function Clothes() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Clothes.prototype.render = function () {
+        return (React.createElement(options_1.Selector, { option: options_1.ClotheOption, defaultOption: BlazerShirt_1.default },
+            React.createElement(BlazerShirt_1.default, null),
+            React.createElement(BlazerSweater_1.default, null),
+            React.createElement(CollarSweater_1.default, null),
+            React.createElement(GraphicShirt_1.default, null),
+            React.createElement(Hoodie_1.default, null),
+            React.createElement(Overall_1.default, null),
+            React.createElement(ShirtCrewNeck_1.default, null),
+            React.createElement(ShirtScoopNeck_1.default, null),
+            React.createElement(ShirtVNeck_1.default, null)));
+    };
+    return Clothes;
+}(React.Component));
+exports.default = Clothes;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/Angry.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/Angry.d.ts
new file mode 100644
index 000000000..4d3894691
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/Angry.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Angry extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/Angry.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/Angry.js
new file mode 100644
index 000000000..5411f004e
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/Angry.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Angry = /** @class */ (function (_super) {
+    __extends(Angry, _super);
+    function Angry() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Angry.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyebrow/Outline/Angry', fillOpacity: '0.599999964', fillRule: 'nonzero' },
+            React.createElement("path", { d: 'M15.6114904,15.1845247 C19.8515017,9.41618792 22.4892046,9.70087612 28.9238518,14.5564693 C29.1057771,14.6937504 29.2212592,14.7812575 29.5936891,15.063789 C34.4216439,18.7263562 36.7081807,20 40,20 C41.1045695,20 42,19.1045695 42,18 C42,16.8954305 41.1045695,16 40,16 C37.9337712,16 36.0986396,14.9777974 32.011227,11.8770179 C31.6358269,11.5922331 31.5189458,11.5036659 31.3332441,11.3635351 C27.5737397,8.52660822 25.3739873,7.28738405 22.6379899,6.99208688 C18.9538127,6.59445233 15.5799484,8.47367246 12.3885096,12.8154753 C11.7343147,13.7054768 11.9254737,14.9572954 12.8154753,15.6114904 C13.7054768,16.2656853 14.9572954,16.0745263 15.6114904,15.1845247 Z', id: 'Eyebrow' }),
+            React.createElement("path", { d: 'M73.6114904,15.1845247 C77.8515017,9.41618792 80.4892046,9.70087612 86.9238518,14.5564693 C87.1057771,14.6937504 87.2212592,14.7812575 87.5936891,15.063789 C92.4216439,18.7263562 94.7081807,20 98,20 C99.1045695,20 100,19.1045695 100,18 C100,16.8954305 99.1045695,16 98,16 C95.9337712,16 94.0986396,14.9777974 90.011227,11.8770179 C89.6358269,11.5922331 89.5189458,11.5036659 89.3332441,11.3635351 C85.5737397,8.52660822 83.3739873,7.28738405 80.6379899,6.99208688 C76.9538127,6.59445233 73.5799484,8.47367246 70.3885096,12.8154753 C69.7343147,13.7054768 69.9254737,14.9572954 70.8154753,15.6114904 C71.7054768,16.2656853 72.9572954,16.0745263 73.6114904,15.1845247 Z', id: 'Eyebrow', transform: 'translate(84.999934, 13.470064) scale(-1, 1) translate(-84.999934, -13.470064) ' })));
+    };
+    Angry.optionValue = 'Angry';
+    return Angry;
+}(React.Component));
+exports.default = Angry;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/AngryNatural.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/AngryNatural.d.ts
new file mode 100644
index 000000000..521cd85d1
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/AngryNatural.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class AngryNatural extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/AngryNatural.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/AngryNatural.js
new file mode 100644
index 000000000..bfee56149
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/AngryNatural.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var AngryNatural = /** @class */ (function (_super) {
+    __extends(AngryNatural, _super);
+    function AngryNatural() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    AngryNatural.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyebrow/Natural/Angry-Natural', fillOpacity: '0.599999964' },
+            React.createElement("path", { d: 'M44.8565785,12.2282877 C44.8578785,12.2192877 44.8578785,12.2192877 44.8565785,12.2282877 M17.5862288,7.89238094 C15.2441598,8.3302947 13.0866155,9.78806858 12.1523766,12.0987479 C11.8009169,12.967391 11.3917103,14.9243181 11.7083227,15.8073302 C11.8284629,16.14295 12.0332321,16.1008692 12.9555234,16.0430509 C14.643791,15.9369937 16.9330912,13.6622369 18.7484684,13.2557982 C21.2753939,12.6899315 23.9825295,13.1148447 26.4961798,13.6882381 C30.8109365,14.6725177 36.4854008,17.7875215 40.9461842,16.1699775 C41.2783949,16.0495512 45.6210294,12.9225732 44.3685187,12.2769925 C43.9238011,11.9068186 41.1370145,12.0854053 40.6216067,11.9988489 C38.2277647,11.5971998 35.7297127,10.9345131 33.373373,10.3265657 C28.2329017,9.00016592 22.9666484,6.88073171 17.5862288,7.89238094', id: 'Eyebrows-The-Web', transform: 'translate(28.094701, 12.127505) rotate(17.000000) translate(-28.094701, -12.127505) ' }),
+            React.createElement("path", { d: 'M100.918293,12.2094196 C100.919593,12.2004196 100.919593,12.2004196 100.918293,12.2094196 M73.5862288,7.89238094 C71.2441598,8.3302947 69.0866155,9.78806858 68.1523766,12.0987479 C67.8009169,12.967391 67.3917103,14.9243181 67.7083227,15.8073302 C67.8284629,16.14295 68.0332321,16.1008692 68.9555234,16.0430509 C70.643791,15.9369937 72.9330912,13.6622369 74.7484684,13.2557982 C77.2753939,12.6899315 79.9825295,13.1148447 82.4961798,13.6882381 C86.8109365,14.6725177 92.4854008,17.7875215 96.9461842,16.1699775 C97.2783949,16.0495512 101.621029,12.9225732 100.368519,12.2769925 C99.9238011,11.9068186 97.1370145,12.0854053 96.6216067,11.9988489 C94.2277647,11.5971998 91.7297127,10.9345131 89.373373,10.3265657 C84.2329017,9.00016592 78.9666484,6.88073171 73.5862288,7.89238094', id: 'Eyebrows-The-Web', transform: 'translate(84.094701, 12.127505) scale(-1, 1) rotate(17.000000) translate(-84.094701, -12.127505) ' })));
+    };
+    AngryNatural.optionValue = 'AngryNatural';
+    return AngryNatural;
+}(React.Component));
+exports.default = AngryNatural;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/Default.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/Default.d.ts
new file mode 100644
index 000000000..4f5b3fa73
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/Default.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Default extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/Default.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/Default.js
new file mode 100644
index 000000000..4e1b33563
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/Default.js
@@ -0,0 +1,31 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Default = /** @class */ (function (_super) {
+    __extends(Default, _super);
+    function Default() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Default.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyebrow/Outline/Default', fillOpacity: '0.599999964' },
+            React.createElement("g", { id: 'I-Browse', transform: 'translate(12.000000, 6.000000)' },
+                React.createElement("path", { d: 'M3.63024536,11.1585767 C7.54515501,5.64986673 18.2779197,2.56083721 27.5230268,4.83118046 C28.5957248,5.0946055 29.6788665,4.43856013 29.9422916,3.36586212 C30.2057166,2.2931641 29.5496712,1.21002236 28.4769732,0.94659732 C17.7403633,-1.69001789 5.31209962,1.88699832 0.369754639,8.84142326 C-0.270109626,9.74178291 -0.0589363917,10.9903811 0.84142326,11.6302454 C1.74178291,12.2701096 2.9903811,12.0589364 3.63024536,11.1585767 Z', id: 'Eyebrow', fillRule: 'nonzero' }),
+                React.createElement("path", { d: 'M61.6302454,11.1585767 C65.545155,5.64986673 76.2779197,2.56083721 85.5230268,4.83118046 C86.5957248,5.0946055 87.6788665,4.43856013 87.9422916,3.36586212 C88.2057166,2.2931641 87.5496712,1.21002236 86.4769732,0.94659732 C75.7403633,-1.69001789 63.3120996,1.88699832 58.3697546,8.84142326 C57.7298904,9.74178291 57.9410636,10.9903811 58.8414233,11.6302454 C59.7417829,12.2701096 60.9903811,12.0589364 61.6302454,11.1585767 Z', id: 'Eyebrow', fillRule: 'nonzero', transform: 'translate(73.000154, 6.039198) scale(-1, 1) translate(-73.000154, -6.039198) ' }))));
+    };
+    Default.optionValue = 'Default';
+    return Default;
+}(React.Component));
+exports.default = Default;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/DefaultNatural.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/DefaultNatural.d.ts
new file mode 100644
index 000000000..081238ede
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/DefaultNatural.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class DefaultNatural extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/DefaultNatural.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/DefaultNatural.js
new file mode 100644
index 000000000..522dd35bb
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/DefaultNatural.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var DefaultNatural = /** @class */ (function (_super) {
+    __extends(DefaultNatural, _super);
+    function DefaultNatural() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    DefaultNatural.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyebrow/Natural/Default-Natural', fillOpacity: '0.599999964' },
+            React.createElement("path", { d: 'M26.0390934,6.21012364 C20.2775554,6.98346216 11.2929313,12.0052479 12.04426,17.8178111 C12.0689481,18.0080543 12.3567302,18.0673468 12.4809077,17.9084937 C14.9674041,14.7203351 34.1927973,10.0365481 41.1942673,11.0147151 C41.8350523,11.1044465 42.2580662,10.4430343 41.8210501,10.0302067 C38.0765663,6.49485426 31.2003792,5.51224825 26.0390934,6.21012364', id: 'Eyebrow', transform: 'translate(27.000000, 12.000000) rotate(5.000000) translate(-27.000000, -12.000000) ' }),
+            React.createElement("path", { d: 'M85.0390934,6.21012364 C79.2775554,6.98346216 70.2929313,12.0052479 71.04426,17.8178111 C71.0689481,18.0080543 71.3567302,18.0673468 71.4809077,17.9084937 C73.9674041,14.7203351 93.1927973,10.0365481 100.194267,11.0147151 C100.835052,11.1044465 101.258066,10.4430343 100.82105,10.0302067 C97.0765663,6.49485426 90.2003792,5.51224825 85.0390934,6.21012364', id: 'Eyebrow', transform: 'translate(86.000000, 12.000000) scale(-1, 1) rotate(5.000000) translate(-86.000000, -12.000000) ' })));
+    };
+    DefaultNatural.optionValue = 'DefaultNatural';
+    return DefaultNatural;
+}(React.Component));
+exports.default = DefaultNatural;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/FlatNatural.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/FlatNatural.d.ts
new file mode 100644
index 000000000..06c995e1b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/FlatNatural.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class FlatNatural extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/FlatNatural.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/FlatNatural.js
new file mode 100644
index 000000000..0f2b11a60
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/FlatNatural.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var FlatNatural = /** @class */ (function (_super) {
+    __extends(FlatNatural, _super);
+    function FlatNatural() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    FlatNatural.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyebrow/Natural/Flat-Natural', fillOpacity: '0.599999964' },
+            React.createElement("path", { d: 'M38.5686071,10.7022978 C33.5865557,11.2384494 28.6553385,11.1338998 23.6562444,11.1010606 C19.8231061,11.0762636 15.91974,10.6892291 12.3246118,12.5091287 C11.6361455,12.8572921 7.8767609,14.9449324 8.00311195,16.0108688 C8.10389896,16.8633498 12.0128479,18.0636592 12.7165939,18.2838164 C16.4280826,19.4452548 19.9241869,18.9282036 23.6870976,18.5703225 C28.3024371,18.1316834 32.9139567,18.1745756 37.5322346,17.8739956 C40.6422336,17.6719334 45.4224171,16.9769469 46.8293214,13.1484895 C47.2530382,11.9954284 46.8152171,9.73353891 46.3074622,8.50642195 C46.1050066,8.01751871 45.5634602,7.84963624 45.1688335,8.14921095 C43.7560524,9.22218432 40.9851444,10.4425994 38.5686071,10.7022978', id: 'Fill-10', transform: 'translate(27.500000, 13.500000) rotate(2.000000) translate(-27.500000, -13.500000) ' }),
+            React.createElement("path", { d: 'M95.5686071,10.7022978 C90.5865557,11.2384494 85.6553385,11.1338998 80.6562444,11.1010606 C76.8231061,11.0762636 72.91974,10.6892291 69.3246118,12.5091287 C68.6361455,12.8572921 64.8767609,14.9449324 65.003112,16.0108688 C65.103899,16.8633498 69.0128479,18.0636592 69.7165939,18.2838164 C73.4280826,19.4452548 76.9241869,18.9282036 80.6870976,18.5703225 C85.3024371,18.1316834 89.9139567,18.1745756 94.5322346,17.8739956 C97.6422336,17.6719334 102.422417,16.9769469 103.829321,13.1484895 C104.253038,11.9954284 103.815217,9.73353891 103.307462,8.50642195 C103.105007,8.01751871 102.56346,7.84963624 102.168833,8.14921095 C100.756052,9.22218432 97.9851444,10.4425994 95.5686071,10.7022978', id: 'Fill-10', transform: 'translate(84.500000, 13.500000) scale(-1, 1) rotate(2.000000) translate(-84.500000, -13.500000) ' })));
+    };
+    FlatNatural.optionValue = 'FlatNatural';
+    return FlatNatural;
+}(React.Component));
+exports.default = FlatNatural;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/FrownNatural.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/FrownNatural.d.ts
new file mode 100644
index 000000000..35acb8d25
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/FrownNatural.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class FrownNatural extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/FrownNatural.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/FrownNatural.js
new file mode 100644
index 000000000..5eb04b36d
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/FrownNatural.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var FrownNatural = /** @class */ (function (_super) {
+    __extends(FrownNatural, _super);
+    function FrownNatural() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    FrownNatural.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyebrow/Natural/Frown-Natural', fillOpacity: '0.599999964' },
+            React.createElement("path", { d: 'M36.3692975,6.87618545 C34.3991755,9.78053246 30.8236346,11.5165625 27.6315757,12.5601676 C23.6890255,13.8490851 9.08080143,15.9390364 12.5196198,23.9079177 C12.572332,24.029546 12.7390347,24.0312591 12.7920764,23.9096308 C13.9448284,21.2646433 30.256648,18.7865093 31.7648785,18.2064622 C36.2101722,16.4974987 40.1579937,12.7153722 40.9269343,7.66282939 C41.2794477,5.34640965 40.2901039,1.6143049 39.3791695,0.113308759 C39.2697915,-0.0669067099 39.0052417,-0.02339461 38.9498938,0.181831751 C38.5898029,1.51323348 37.5385221,5.15317482 36.3692975,6.87618545', id: 'Fill-5' }),
+            React.createElement("path", { d: 'M95.3692975,6.87618545 C93.3991755,9.78053246 89.8236346,11.5165625 86.6315757,12.5601676 C82.6890255,13.8490851 68.0808014,15.9390364 71.5196198,23.9079177 C71.572332,24.029546 71.7390347,24.0312591 71.7920764,23.9096308 C72.9448284,21.2646433 89.256648,18.7865093 90.7648785,18.2064622 C95.2101722,16.4974987 99.1579937,12.7153722 99.9269343,7.66282939 C100.279448,5.34640965 99.2901039,1.6143049 98.3791695,0.113308759 C98.2697915,-0.0669067099 98.0052417,-0.02339461 97.9498938,0.181831751 C97.5898029,1.51323348 96.5385221,5.15317482 95.3692975,6.87618545', id: 'Fill-5', transform: 'translate(85.500000, 12.000000) scale(-1, 1) translate(-85.500000, -12.000000) ' })));
+    };
+    FrownNatural.optionValue = 'FrownNatural';
+    return FrownNatural;
+}(React.Component));
+exports.default = FrownNatural;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/RaisedExcited.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/RaisedExcited.d.ts
new file mode 100644
index 000000000..bd5a4814d
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/RaisedExcited.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class RaisedExcited extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/RaisedExcited.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/RaisedExcited.js
new file mode 100644
index 000000000..8cf954929
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/RaisedExcited.js
@@ -0,0 +1,31 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var RaisedExcited = /** @class */ (function (_super) {
+    __extends(RaisedExcited, _super);
+    function RaisedExcited() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    RaisedExcited.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyebrow/Outline/Raised-Excited', fillOpacity: '0.599999964' },
+            React.createElement("g", { id: 'I-Browse', transform: 'translate(12.000000, 0.000000)' },
+                React.createElement("path", { d: 'M3.97579559,17.1279169 C5.47099148,7.60476158 18.0585488,1.10867597 27.1635167,5.30104271 C28.1668367,5.76301969 29.3546946,5.32417444 29.8166716,4.32085442 C30.2786486,3.3175344 29.8398033,2.12967649 28.8364833,1.66769952 C17.3488212,-3.62177466 1.93575948,4.3324746 0.0242044059,16.507492 C-0.147121205,17.5986938 0.598585765,18.6221744 1.68978754,18.7935 C2.78098932,18.9648257 3.80446998,18.2191187 3.97579559,17.1279169 Z', id: 'Eyebrow', fillRule: 'nonzero' }),
+                React.createElement("path", { d: 'M61.9757956,17.1279169 C63.4709915,7.60476158 76.0585488,1.10867597 85.1635167,5.30104271 C86.1668367,5.76301969 87.3546946,5.32417444 87.8166716,4.32085442 C88.2786486,3.3175344 87.8398033,2.12967649 86.8364833,1.66769952 C75.3488212,-3.62177466 59.9357595,4.3324746 58.0242044,16.507492 C57.8528788,17.5986938 58.5985858,18.6221744 59.6897875,18.7935 C60.7809893,18.9648257 61.80447,18.2191187 61.9757956,17.1279169 Z', id: 'Eyebrow', fillRule: 'nonzero', transform: 'translate(73.000097, 9.410436) scale(-1, 1) translate(-73.000097, -9.410436) ' }))));
+    };
+    RaisedExcited.optionValue = 'RaisedExcited';
+    return RaisedExcited;
+}(React.Component));
+exports.default = RaisedExcited;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/RaisedExcitedNatural.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/RaisedExcitedNatural.d.ts
new file mode 100644
index 000000000..097b62326
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/RaisedExcitedNatural.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class RaisedExcitedNatural extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/RaisedExcitedNatural.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/RaisedExcitedNatural.js
new file mode 100644
index 000000000..e181ec7ec
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/RaisedExcitedNatural.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var RaisedExcitedNatural = /** @class */ (function (_super) {
+    __extends(RaisedExcitedNatural, _super);
+    function RaisedExcitedNatural() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    RaisedExcitedNatural.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyebrow/Natural/Raised-Excited-Natural', fillOpacity: '0.599999964' },
+            React.createElement("path", { d: 'M22.7663531,1.57844898 L23.6772984,1.17582144 C28.9190996,-0.905265751 36.8645466,-0.0328729562 41.7227321,2.29911638 C42.2897848,2.57148957 41.9021563,3.4519421 41.3211012,3.40711006 C26.4021788,2.25602197 16.3582869,11.5525942 12.9460869,17.8470939 C12.8449215,18.0337142 12.5391523,18.05489 12.4635344,17.8808353 C10.156283,12.5620676 16.9134476,3.89614725 22.7663531,1.57844898 Z', id: 'Eye-Browse-Reddit' }),
+            React.createElement("path", { d: 'M80.7663531,1.57844898 L81.6772984,1.17582144 C86.9190996,-0.905265751 94.8645466,-0.0328729562 99.7227321,2.29911638 C100.289785,2.57148957 99.9021563,3.4519421 99.3211012,3.40711006 C84.4021788,2.25602197 74.3582869,11.5525942 70.9460869,17.8470939 C70.8449215,18.0337142 70.5391523,18.05489 70.4635344,17.8808353 C68.156283,12.5620676 74.9134476,3.89614725 80.7663531,1.57844898 Z', id: 'Eye-Browse-Reddit', transform: 'translate(85.000000, 9.000000) scale(-1, 1) translate(-85.000000, -9.000000) ' })));
+    };
+    RaisedExcitedNatural.optionValue = 'RaisedExcitedNatural';
+    return RaisedExcitedNatural;
+}(React.Component));
+exports.default = RaisedExcitedNatural;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/SadConcerned.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/SadConcerned.d.ts
new file mode 100644
index 000000000..c4a513d46
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/SadConcerned.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class SadConcerned extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/SadConcerned.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/SadConcerned.js
new file mode 100644
index 000000000..803dab8cf
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/SadConcerned.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var SadConcerned = /** @class */ (function (_super) {
+    __extends(SadConcerned, _super);
+    function SadConcerned() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    SadConcerned.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyebrow/Outline/Sad-Concerned', fillOpacity: '0.599999964', fillRule: 'nonzero' },
+            React.createElement("path", { d: 'M15.9726042,19.4088529 C17.452356,11.0203704 30.0622688,5.22829657 39.2106453,8.9774793 C40.2254706,9.39337449 41.4016967,8.94600219 41.8378196,7.97824531 C42.2739426,7.01048842 41.8048116,5.88881678 40.7899862,5.47292159 C29.3457328,0.782843812 13.9550264,7.85221132 12.0280273,18.7760684 C11.84479,19.8148122 12.5792704,20.798534 13.6685352,20.9732726 C14.7578,21.1480113 15.7893668,20.4475967 15.9726042,19.4088529 Z', id: 'Eyebrow', transform: 'translate(27.000414, 12.500000) scale(-1, -1) translate(-27.000414, -12.500000) ' }),
+            React.createElement("path", { d: 'M73.9726042,19.4088529 C75.452356,11.0203704 88.0622688,5.22829657 97.2106453,8.9774793 C98.2254706,9.39337449 99.4016967,8.94600219 99.8378196,7.97824531 C100.273943,7.01048842 99.8048116,5.88881678 98.7899862,5.47292159 C87.3457328,0.782843812 71.9550264,7.85221132 70.0280273,18.7760684 C69.84479,19.8148122 70.5792704,20.798534 71.6685352,20.9732726 C72.7578,21.1480113 73.7893668,20.4475967 73.9726042,19.4088529 Z', id: 'Eyebrow', transform: 'translate(85.000414, 12.500000) scale(1, -1) translate(-85.000414, -12.500000) ' })));
+    };
+    SadConcerned.optionValue = 'SadConcerned';
+    return SadConcerned;
+}(React.Component));
+exports.default = SadConcerned;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/SadConcernedNatural.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/SadConcernedNatural.d.ts
new file mode 100644
index 000000000..5f978d571
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/SadConcernedNatural.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class SadConcernedNatural extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/SadConcernedNatural.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/SadConcernedNatural.js
new file mode 100644
index 000000000..c12a5dd5b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/SadConcernedNatural.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var SadConcernedNatural = /** @class */ (function (_super) {
+    __extends(SadConcernedNatural, _super);
+    function SadConcernedNatural() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    SadConcernedNatural.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyebrow/Natural/Sad-Concerned-Natural', fillOpacity: '0.599999964' },
+            React.createElement("path", { d: 'M22.7663531,5.57844898 L23.6772984,5.17582144 C28.9190996,3.09473425 36.8645466,3.96712704 41.7227321,6.29911638 C42.2897848,6.57148957 41.9021563,7.4519421 41.3211012,7.40711006 C26.4021788,6.25602197 16.3582869,15.5525942 12.9460869,21.8470939 C12.8449215,22.0337142 12.5391523,22.05489 12.4635344,21.8808353 C10.156283,16.5620676 16.9134476,7.89614725 22.7663531,5.57844898 Z', id: 'Eyebrow', transform: 'translate(27.000000, 13.000000) scale(-1, -1) translate(-27.000000, -13.000000) ' }),
+            React.createElement("path", { d: 'M80.7663531,5.57844898 L81.6772984,5.17582144 C86.9190996,3.09473425 94.8645466,3.96712704 99.7227321,6.29911638 C100.289785,6.57148957 99.9021563,7.4519421 99.3211012,7.40711006 C84.4021788,6.25602197 74.3582869,15.5525942 70.9460869,21.8470939 C70.8449215,22.0337142 70.5391523,22.05489 70.4635344,21.8808353 C68.156283,16.5620676 74.9134476,7.89614725 80.7663531,5.57844898 Z', id: 'Eyebrow', transform: 'translate(85.000000, 13.000000) scale(1, -1) translate(-85.000000, -13.000000) ' })));
+    };
+    SadConcernedNatural.optionValue = 'SadConcernedNatural';
+    return SadConcernedNatural;
+}(React.Component));
+exports.default = SadConcernedNatural;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UnibrowNatural.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UnibrowNatural.d.ts
new file mode 100644
index 000000000..83bb1ade6
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UnibrowNatural.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class UnibrowNatural extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UnibrowNatural.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UnibrowNatural.js
new file mode 100644
index 000000000..79962f036
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UnibrowNatural.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var UnibrowNatural = /** @class */ (function (_super) {
+    __extends(UnibrowNatural, _super);
+    function UnibrowNatural() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    UnibrowNatural.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyebrow/Natural/Unibrow-Natural', fillOpacity: '0.599999964' },
+            React.createElement("path", { d: 'M57.000525,12 C56.999825,11.9961 56.999825,11.9961 57.000525,12 M59.4596631,14.892451 C61.3120123,16.058698 64.1131185,16.7894891 65.7030886,17.0505179 C71.9486685,18.0766191 78.0153663,15.945512 84.1715051,15.0153209 C89.636055,14.1895424 95.8563653,13.4967455 100.86041,16.507708 C100.987756,16.584232 101.997542,17.2147893 102.524546,17.7511372 C102.91024,18.1443003 103.563259,18.0619945 103.822605,17.5722412 C105.241692,14.8939029 97.7243204,8.76008291 96.2812935,8.14993193 C89.7471082,5.39200867 81.0899445,8.32440654 74.4284137,9.38927986 C70.6888462,9.98718701 66.9279989,10.3803501 63.2409655,11.2908151 C61.9188284,11.6171635 60.6278928,12.2066818 59.3382119,12.3724317 C59.1848981,12.1429782 58.9889964,12 58.7633758,12 C57.5922879,12 55.8451696,15.4574504 58.0750241,15.6547468 C58.7728345,15.7164887 59.215997,15.3816732 59.4596631,14.892451 Z', id: 'Kahlo', transform: 'translate(80.500000, 12.500000) rotate(-2.000000) translate(-80.500000, -12.500000) ' }),
+            React.createElement("path", { d: 'M54.999475,12 C55.000175,11.9961 55.000175,11.9961 54.999475,12 M15.7187065,8.14993193 C22.2528918,5.39200867 30.9100555,8.32440654 37.5715863,9.38927986 C41.3111538,9.98718701 45.0720011,10.3803501 48.7590345,11.2908151 C50.2416282,11.6567696 51.6849876,12.3536477 53.1313394,12.4128263 C53.8325707,12.4413952 54.2674737,13.2763566 53.8149484,13.8242681 C52.3320222,15.6179895 48.3271239,16.7172136 46.2969114,17.0505179 C40.0513315,18.0766191 33.9846337,15.945512 27.8284949,15.0153209 C22.363945,14.1895424 16.1436347,13.4967455 11.1395899,16.507708 C11.0122444,16.584232 10.0024581,17.2147893 9.47545402,17.7511372 C9.0897602,18.1443003 8.43674067,18.0619945 8.17739482,17.5722412 C6.75830756,14.8939029 14.2756796,8.76008291 15.7187065,8.14993193 Z M54.9339874,11 C56.1050753,11 57.8521936,15.4015737 55.6223391,15.6527457 C53.3924847,15.9039176 53.7628995,11 54.9339874,11 Z', id: 'Frida', transform: 'translate(32.348682, 12.500000) rotate(2.000000) translate(-32.348682, -12.500000) ' })));
+    };
+    UnibrowNatural.optionValue = 'UnibrowNatural';
+    return UnibrowNatural;
+}(React.Component));
+exports.default = UnibrowNatural;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UpDown.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UpDown.d.ts
new file mode 100644
index 000000000..031309556
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UpDown.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class UpDown extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UpDown.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UpDown.js
new file mode 100644
index 000000000..40919cc1c
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UpDown.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var UpDown = /** @class */ (function (_super) {
+    __extends(UpDown, _super);
+    function UpDown() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    UpDown.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyebrow/Outline/Up-Down', fillOpacity: '0.599999964', fillRule: 'nonzero' },
+            React.createElement("path", { d: 'M15.5914402,14.1619718 C20.0874642,7.83556966 29.6031809,4.65350252 39.3473715,7.79575991 C40.3986323,8.13476518 41.5256656,7.55736801 41.8646708,6.50610724 C42.2036761,5.45484647 41.6262789,4.32781316 40.5750182,3.98880789 C29.1665516,0.309863172 17.8358054,4.09887835 12.3309495,11.8448183 C11.6910852,12.7451779 11.9022584,13.9937761 12.8026181,14.6336404 C13.7029777,15.2735046 14.9515759,15.0623314 15.5914402,14.1619718 Z', id: 'Eyebrow' }),
+            React.createElement("path", { d: 'M73.6376405,21.1577995 C77.5525501,15.6490895 88.2853148,12.56006 97.5304219,14.8304032 C98.6031199,15.0938282 99.6862617,14.4377829 99.9496867,13.3650849 C100.213112,12.2923868 99.5570664,11.2092451 98.4843684,10.9458201 C87.7477584,8.30920485 75.3194947,11.8862211 70.3771498,18.840646 C69.7372855,19.7410057 69.9484587,20.9896038 70.8488184,21.6294681 C71.749178,22.2693324 72.9977762,22.0581591 73.6376405,21.1577995 Z', id: 'Eyebrow', transform: 'translate(85.007549, 16.038421) scale(-1, 1) translate(-85.007549, -16.038421) ' })));
+    };
+    UpDown.optionValue = 'UpDown';
+    return UpDown;
+}(React.Component));
+exports.default = UpDown;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UpDownNatural.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UpDownNatural.d.ts
new file mode 100644
index 000000000..9fb2fb33b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UpDownNatural.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class UpDownNatural extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UpDownNatural.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UpDownNatural.js
new file mode 100644
index 000000000..dd25bef20
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/UpDownNatural.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var UpDownNatural = /** @class */ (function (_super) {
+    __extends(UpDownNatural, _super);
+    function UpDownNatural() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    UpDownNatural.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyebrow/Natural/Up-Down-Natural', fillOpacity: '0.599999964' },
+            React.createElement("path", { d: 'M22.7663531,1.57844898 L23.6772984,1.17582144 C28.9190996,-0.905265751 36.8645466,-0.0328729562 41.7227321,2.29911638 C42.2897848,2.57148957 41.9021563,3.4519421 41.3211012,3.40711006 C26.4021788,2.25602197 16.3582869,11.5525942 12.9460869,17.8470939 C12.8449215,18.0337142 12.5391523,18.05489 12.4635344,17.8808353 C10.156283,12.5620676 16.9134476,3.89614725 22.7663531,1.57844898 Z', id: 'Eye-Browse-Reddit' }),
+            React.createElement("path", { d: 'M86.535177,12.0246305 C92.3421916,12.2928751 101.730304,16.5124899 101.488432,22.3684172 C101.480419,22.5600881 101.1989,22.6442368 101.06135,22.496811 C98.306449,19.5374968 78.7459953,16.5471364 71.8564209,18.1317995 C71.2258949,18.2770375 70.7468448,17.6550104 71.1462176,17.2056651 C74.5683263,13.3574126 81.3327077,11.7792465 86.535177,12.0246305 Z', id: 'Eyebrow', transform: 'translate(86.246508, 17.285912) rotate(5.000000) translate(-86.246508, -17.285912) ' })));
+    };
+    UpDownNatural.optionValue = 'UpDownNatural';
+    return UpDownNatural;
+}(React.Component));
+exports.default = UpDownNatural;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/index.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/index.d.ts
new file mode 100644
index 000000000..0452cb679
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/index.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+export default class Eyebrow extends React.Component {
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/index.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/index.js
new file mode 100644
index 000000000..9d38ae402
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyebrow/index.js
@@ -0,0 +1,52 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Angry_1 = require("./Angry");
+var AngryNatural_1 = require("./AngryNatural");
+var Default_1 = require("./Default");
+var DefaultNatural_1 = require("./DefaultNatural");
+var FlatNatural_1 = require("./FlatNatural");
+var RaisedExcited_1 = require("./RaisedExcited");
+var RaisedExcitedNatural_1 = require("./RaisedExcitedNatural");
+var SadConcerned_1 = require("./SadConcerned");
+var SadConcernedNatural_1 = require("./SadConcernedNatural");
+var UnibrowNatural_1 = require("./UnibrowNatural");
+var UpDown_1 = require("./UpDown");
+var UpDownNatural_1 = require("./UpDownNatural");
+var options_1 = require("../../../options");
+var Eyebrow = /** @class */ (function (_super) {
+    __extends(Eyebrow, _super);
+    function Eyebrow() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Eyebrow.prototype.render = function () {
+        return (React.createElement(options_1.Selector, { defaultOption: Default_1.default, option: options_1.EyebrowOption },
+            React.createElement(Angry_1.default, null),
+            React.createElement(AngryNatural_1.default, null),
+            React.createElement(Default_1.default, null),
+            React.createElement(DefaultNatural_1.default, null),
+            React.createElement(FlatNatural_1.default, null),
+            React.createElement(RaisedExcited_1.default, null),
+            React.createElement(RaisedExcitedNatural_1.default, null),
+            React.createElement(SadConcerned_1.default, null),
+            React.createElement(SadConcernedNatural_1.default, null),
+            React.createElement(UnibrowNatural_1.default, null),
+            React.createElement(UpDown_1.default, null),
+            React.createElement(UpDownNatural_1.default, null)));
+    };
+    return Eyebrow;
+}(React.Component));
+exports.default = Eyebrow;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Close.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Close.d.ts
new file mode 100644
index 000000000..e3b4d3ff7
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Close.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Close extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Close.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Close.js
new file mode 100644
index 000000000..a17fed6fd
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Close.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Close = /** @class */ (function (_super) {
+    __extends(Close, _super);
+    function Close() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Close.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyes/Closed-\uD83D\uDE0C', transform: 'translate(0.000000, 8.000000)', fillOpacity: '0.599999964' },
+            React.createElement("path", { d: 'M16.1601674,32.4473116 C18.006676,28.648508 22.1644225,26 26.9975803,26 C31.8136766,26 35.9591217,28.629842 37.8153518,32.4071242 C38.3667605,33.5291977 37.5821037,34.4474817 36.790607,33.7670228 C34.3395063,31.6597833 30.8587163,30.3437884 26.9975803,30.3437884 C23.2572061,30.3437884 19.8737584,31.5787519 17.4375392,33.5716412 C16.5467928,34.3002944 15.6201012,33.5583844 16.1601674,32.4473116 Z', id: 'Closed-Eye', transform: 'translate(27.000000, 30.000000) scale(1, -1) translate(-27.000000, -30.000000) ' }),
+            React.createElement("path", { d: 'M74.1601674,32.4473116 C76.006676,28.648508 80.1644225,26 84.9975803,26 C89.8136766,26 93.9591217,28.629842 95.8153518,32.4071242 C96.3667605,33.5291977 95.5821037,34.4474817 94.790607,33.7670228 C92.3395063,31.6597833 88.8587163,30.3437884 84.9975803,30.3437884 C81.2572061,30.3437884 77.8737584,31.5787519 75.4375392,33.5716412 C74.5467928,34.3002944 73.6201012,33.5583844 74.1601674,32.4473116 Z', id: 'Closed-Eye', transform: 'translate(85.000000, 30.000000) scale(1, -1) translate(-85.000000, -30.000000) ' })));
+    };
+    Close.optionValue = 'Close';
+    return Close;
+}(React.Component));
+exports.default = Close;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Cry.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Cry.d.ts
new file mode 100644
index 000000000..f55d003e6
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Cry.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Cry extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Cry.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Cry.js
new file mode 100644
index 000000000..7a5cfe7cd
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Cry.js
@@ -0,0 +1,31 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Cry = /** @class */ (function (_super) {
+    __extends(Cry, _super);
+    function Cry() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Cry.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyes/Cry-\uD83D\uDE22', transform: 'translate(0.000000, 8.000000)' },
+            React.createElement("circle", { id: 'Eye', fillOpacity: '0.599999964', fill: '#000000', fillRule: 'evenodd', cx: '30', cy: '22', r: '6' }),
+            React.createElement("path", { d: 'M25,27 C25,27 19,34.2706667 19,38.2706667 C19,41.5846667 21.686,44.2706667 25,44.2706667 C28.314,44.2706667 31,41.5846667 31,38.2706667 C31,34.2706667 25,27 25,27 Z', id: 'Drop', fill: '#92D9FF', fillRule: 'nonzero' }),
+            React.createElement("circle", { id: 'Eye', fillOpacity: '0.599999964', fill: '#000000', fillRule: 'evenodd', cx: '82', cy: '22', r: '6' })));
+    };
+    Cry.optionValue = 'Cry';
+    return Cry;
+}(React.Component));
+exports.default = Cry;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Default.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Default.d.ts
new file mode 100644
index 000000000..4f5b3fa73
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Default.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Default extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Default.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Default.js
new file mode 100644
index 000000000..76936fd03
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Default.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Default = /** @class */ (function (_super) {
+    __extends(Default, _super);
+    function Default() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Default.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyes/Default-\uD83D\uDE00', transform: 'translate(0.000000, 8.000000)', fillOpacity: '0.599999964' },
+            React.createElement("circle", { id: 'Eye', cx: '30', cy: '22', r: '6' }),
+            React.createElement("circle", { id: 'Eye', cx: '82', cy: '22', r: '6' })));
+    };
+    Default.optionValue = 'Default';
+    return Default;
+}(React.Component));
+exports.default = Default;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Dizzy.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Dizzy.d.ts
new file mode 100644
index 000000000..81fe9acf0
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Dizzy.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Dizzy extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Dizzy.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Dizzy.js
new file mode 100644
index 000000000..815c722a4
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Dizzy.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Dizzy = /** @class */ (function (_super) {
+    __extends(Dizzy, _super);
+    function Dizzy() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Dizzy.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyes/X-Dizzy-\uD83D\uDE35', transform: 'translate(0.000000, 8.000000)', fillOpacity: '0.599999964', fillRule: 'nonzero' },
+            React.createElement("path", { d: 'M29,25.2 L34.5,30.7 C35,31.1 35.7,31.1 36.1,30.7 L37.7,29.1 C38.1,28.6 38.1,27.9 37.7,27.5 L32.2,22 L37.7,16.5 C38.1,16 38.1,15.3 37.7,14.9 L36.1,13.3 C35.6,12.9 34.9,12.9 34.5,13.3 L29,18.8 L23.5,13.3 C23,12.9 22.3,12.9 21.9,13.3 L20.3,14.9 C19.9,15.3 19.9,16 20.3,16.5 L25.8,22 L20.3,27.5 C19.9,28 19.9,28.7 20.3,29.1 L21.9,30.7 C22.4,31.1 23.1,31.1 23.5,30.7 L29,25.2 Z', id: 'Eye' }),
+            React.createElement("path", { d: 'M83,25.2 L88.5,30.7 C89,31.1 89.7,31.1 90.1,30.7 L91.7,29.1 C92.1,28.6 92.1,27.9 91.7,27.5 L86.2,22 L91.7,16.5 C92.1,16 92.1,15.3 91.7,14.9 L90.1,13.3 C89.6,12.9 88.9,12.9 88.5,13.3 L83,18.8 L77.5,13.3 C77,12.9 76.3,12.9 75.9,13.3 L74.3,14.9 C73.9,15.3 73.9,16 74.3,16.5 L79.8,22 L74.3,27.5 C73.9,28 73.9,28.7 74.3,29.1 L75.9,30.7 C76.4,31.1 77.1,31.1 77.5,30.7 L83,25.2 Z', id: 'Eye' })));
+    };
+    Dizzy.optionValue = 'Dizzy';
+    return Dizzy;
+}(React.Component));
+exports.default = Dizzy;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/EyeRoll.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/EyeRoll.d.ts
new file mode 100644
index 000000000..2df805d99
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/EyeRoll.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class EyeRoll extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/EyeRoll.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/EyeRoll.js
new file mode 100644
index 000000000..cb722fdbd
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/EyeRoll.js
@@ -0,0 +1,32 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var EyeRoll = /** @class */ (function (_super) {
+    __extends(EyeRoll, _super);
+    function EyeRoll() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    EyeRoll.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyes/Eye-Roll-\uD83D\uDE44', transform: 'translate(0.000000, 8.000000)' },
+            React.createElement("circle", { id: 'Eyeball', fill: '#FFFFFF', cx: '30', cy: '22', r: '14' }),
+            React.createElement("circle", { id: 'The-white-stuff', fill: '#FFFFFF', cx: '82', cy: '22', r: '14' }),
+            React.createElement("circle", { id: 'Eye', fillOpacity: '0.699999988', fill: '#000000', cx: '30', cy: '14', r: '6' }),
+            React.createElement("circle", { id: 'Eye', fillOpacity: '0.699999988', fill: '#000000', cx: '82', cy: '14', r: '6' })));
+    };
+    EyeRoll.optionValue = 'EyeRoll';
+    return EyeRoll;
+}(React.Component));
+exports.default = EyeRoll;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Happy.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Happy.d.ts
new file mode 100644
index 000000000..b6699d594
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Happy.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Happy extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Happy.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Happy.js
new file mode 100644
index 000000000..12a06338f
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Happy.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Happy = /** @class */ (function (_super) {
+    __extends(Happy, _super);
+    function Happy() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Happy.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyes/Happy-\uD83D\uDE01', transform: 'translate(0.000000, 8.000000)', fillOpacity: '0.599999964' },
+            React.createElement("path", { d: 'M16.1601674,22.4473116 C18.006676,18.648508 22.1644225,16 26.9975803,16 C31.8136766,16 35.9591217,18.629842 37.8153518,22.4071242 C38.3667605,23.5291977 37.5821037,24.4474817 36.790607,23.7670228 C34.3395063,21.6597833 30.8587163,20.3437884 26.9975803,20.3437884 C23.2572061,20.3437884 19.8737584,21.5787519 17.4375392,23.5716412 C16.5467928,24.3002944 15.6201012,23.5583844 16.1601674,22.4473116 Z', id: 'Squint' }),
+            React.createElement("path", { d: 'M74.1601674,22.4473116 C76.006676,18.648508 80.1644225,16 84.9975803,16 C89.8136766,16 93.9591217,18.629842 95.8153518,22.4071242 C96.3667605,23.5291977 95.5821037,24.4474817 94.790607,23.7670228 C92.3395063,21.6597833 88.8587163,20.3437884 84.9975803,20.3437884 C81.2572061,20.3437884 77.8737584,21.5787519 75.4375392,23.5716412 C74.5467928,24.3002944 73.6201012,23.5583844 74.1601674,22.4473116 Z', id: 'Squint' })));
+    };
+    Happy.optionValue = 'Happy';
+    return Happy;
+}(React.Component));
+exports.default = Happy;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Hearts.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Hearts.d.ts
new file mode 100644
index 000000000..69100c81b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Hearts.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Hearts extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Hearts.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Hearts.js
new file mode 100644
index 000000000..7378c3b78
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Hearts.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Hearts = /** @class */ (function (_super) {
+    __extends(Hearts, _super);
+    function Hearts() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Hearts.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyes/Hearts-\uD83D\uDE0D', transform: 'translate(0.000000, 8.000000)', fillOpacity: '0.8', fillRule: 'nonzero', fill: '#FF5353' },
+            React.createElement("path", { d: 'M35.9583333,10 C33.4074091,10 30.8837273,11.9797894 29.5,13.8206358 C28.1106364,11.9797894 25.5925909,10 23.0416667,10 C17.5523182,10 14,13.3341032 14,17.6412715 C14,23.3708668 18.4118636,26.771228 23.0416667,30.376724 C24.695,31.6133636 27.8223436,34.7777086 28.2083333,35.470905 C28.5943231,36.1641015 30.3143077,36.1885229 30.7916667,35.470905 C31.2690257,34.7532872 34.3021818,31.6133636 35.9583333,30.376724 C40.5853182,26.771228 45,23.3708668 45,17.6412715 C45,13.3341032 41.4476818,10 35.9583333,10 Z', id: 'Heart' }),
+            React.createElement("path", { d: 'M88.9583333,10 C86.4074091,10 83.8837273,11.9797894 82.5,13.8206358 C81.1106364,11.9797894 78.5925909,10 76.0416667,10 C70.5523182,10 67,13.3341032 67,17.6412715 C67,23.3708668 71.4118636,26.771228 76.0416667,30.376724 C77.695,31.6133636 80.8223436,34.7777086 81.2083333,35.470905 C81.5943231,36.1641015 83.3143077,36.1885229 83.7916667,35.470905 C84.2690257,34.7532872 87.3021818,31.6133636 88.9583333,30.376724 C93.5853182,26.771228 98,23.3708668 98,17.6412715 C98,13.3341032 94.4476818,10 88.9583333,10 Z', id: 'Heart' })));
+    };
+    Hearts.optionValue = 'Hearts';
+    return Hearts;
+}(React.Component));
+exports.default = Hearts;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Side.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Side.d.ts
new file mode 100644
index 000000000..2225eaf8c
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Side.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Side extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Side.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Side.js
new file mode 100644
index 000000000..b2eee912c
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Side.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Side = /** @class */ (function (_super) {
+    __extends(Side, _super);
+    function Side() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Side.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyes/Side-\uD83D\uDE12', transform: 'translate(0.000000, 8.000000)', fillOpacity: '0.599999964' },
+            React.createElement("path", { d: 'M27.2409577,20.3455337 C26.462715,21.3574913 26,22.6247092 26,24 C26,27.3137085 28.6862915,30 32,30 C35.3137085,30 38,27.3137085 38,24 C38,23.7097898 37.9793961,23.4243919 37.9395713,23.1451894 C37.9474218,22.9227843 37.9097825,22.6709538 37.8153518,22.4071242 C37.7703692,22.2814477 37.7221152,22.1572512 37.6706873,22.0345685 C37.3370199,21.0717264 36.7650456,20.2202109 36.0253277,19.550585 C33.898886,17.3173253 30.5064735,16 26.9975803,16 C22.1644225,16 18.006676,18.648508 16.1601674,22.4473116 C15.6201012,23.5583844 16.5467928,24.3002944 17.4375392,23.5716412 C19.8737584,21.5787519 23.2572061,20.3437884 26.9975803,20.3437884 C27.0788767,20.3437884 27.1600045,20.3443718 27.2409577,20.3455337 Z', id: 'Eye' }),
+            React.createElement("path", { d: 'M85.2409577,20.3455337 C84.462715,21.3574913 84,22.6247092 84,24 C84,27.3137085 86.6862915,30 90,30 C93.3137085,30 96,27.3137085 96,24 C96,23.7097898 95.9793961,23.4243919 95.9395713,23.1451894 C95.9474218,22.9227843 95.9097825,22.6709538 95.8153518,22.4071242 C95.7703692,22.2814477 95.7221152,22.1572512 95.6706873,22.0345685 C95.3370199,21.0717264 94.7650456,20.2202109 94.0253277,19.550585 C91.898886,17.3173253 88.5064735,16 84.9975803,16 C80.1644225,16 76.006676,18.648508 74.1601674,22.4473116 C73.6201012,23.5583844 74.5467928,24.3002944 75.4375392,23.5716412 C77.8737584,21.5787519 81.2572061,20.3437884 84.9975803,20.3437884 C85.0788767,20.3437884 85.1600045,20.3443718 85.2409577,20.3455337 Z', id: 'Eye' })));
+    };
+    Side.optionValue = 'Side';
+    return Side;
+}(React.Component));
+exports.default = Side;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Squint.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Squint.d.ts
new file mode 100644
index 000000000..12b1189ab
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Squint.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+export default class Squint extends React.Component {
+    static optionValue: string;
+    private path1;
+    private path2;
+    private mask1;
+    private mask2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Squint.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Squint.js
new file mode 100644
index 000000000..51ed159c7
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Squint.js
@@ -0,0 +1,48 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Squint = /** @class */ (function (_super) {
+    __extends(Squint, _super);
+    function Squint() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        return _this;
+    }
+    Squint.prototype.render = function () {
+        var _a = this, path1 = _a.path1, path2 = _a.path2, mask1 = _a.mask1, mask2 = _a.mask2;
+        return (React.createElement("g", { id: 'Eyes/Squint-\uD83D\uDE0A', transform: 'translate(0.000000, 8.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M14,14.0481187 C23.6099827,14.0481187 28,18.4994466 28,11.5617716 C28,4.62409673 21.7319865,0 14,0 C6.2680135,0 0,4.62409673 0,11.5617716 C0,18.4994466 4.39001726,14.0481187 14,14.0481187 Z', id: path1 }),
+                React.createElement("path", { d: 'M14,14.0481187 C23.6099827,14.0481187 28,18.4994466 28,11.5617716 C28,4.62409673 21.7319865,0 14,0 C6.2680135,0 0,4.62409673 0,11.5617716 C0,18.4994466 4.39001726,14.0481187 14,14.0481187 Z', id: path2 })),
+            React.createElement("g", { id: 'Eye', transform: 'translate(16.000000, 13.000000)' },
+                React.createElement("mask", { id: mask1, fill: 'white' },
+                    React.createElement("use", { xlinkHref: '#' + path1 })),
+                React.createElement("use", { id: 'The-white-stuff', fill: '#FFFFFF', xlinkHref: '#' + path1 }),
+                React.createElement("circle", { fillOpacity: '0.699999988', fill: '#000000', mask: "url(#" + mask1 + ")", cx: '14', cy: '10', r: '6' })),
+            React.createElement("g", { id: 'Eye', transform: 'translate(68.000000, 13.000000)' },
+                React.createElement("mask", { id: mask2, fill: 'white' },
+                    React.createElement("use", { xlinkHref: '#' + path2 })),
+                React.createElement("use", { id: 'Eyeball-Mask', fill: '#FFFFFF', xlinkHref: '#' + path2 }),
+                React.createElement("circle", { fillOpacity: '0.699999988', fill: '#000000', mask: "url(#" + mask2 + ")", cx: '14', cy: '10', r: '6' }))));
+    };
+    Squint.optionValue = 'Squint';
+    return Squint;
+}(React.Component));
+exports.default = Squint;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Surprised.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Surprised.d.ts
new file mode 100644
index 000000000..3ea5ee706
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Surprised.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Surprised extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Surprised.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Surprised.js
new file mode 100644
index 000000000..28e7227ad
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Surprised.js
@@ -0,0 +1,32 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Surprised = /** @class */ (function (_super) {
+    __extends(Surprised, _super);
+    function Surprised() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Surprised.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyes/Surprised-\uD83D\uDE33', transform: 'translate(0.000000, 8.000000)' },
+            React.createElement("circle", { id: 'The-White-Stuff', fill: '#FFFFFF', cx: '30', cy: '22', r: '14' }),
+            React.createElement("circle", { id: 'Eye-Ball', fill: '#FFFFFF', cx: '82', cy: '22', r: '14' }),
+            React.createElement("circle", { id: 'Eye', fillOpacity: '0.699999988', fill: '#000000', cx: '30', cy: '22', r: '6' }),
+            React.createElement("circle", { id: 'Eye', fillOpacity: '0.699999988', fill: '#000000', cx: '82', cy: '22', r: '6' })));
+    };
+    Surprised.optionValue = 'Surprised';
+    return Surprised;
+}(React.Component));
+exports.default = Surprised;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Wink.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Wink.d.ts
new file mode 100644
index 000000000..bc0b7fe9d
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Wink.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Wink extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Wink.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Wink.js
new file mode 100644
index 000000000..3eca909f5
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/Wink.js
@@ -0,0 +1,30 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Wink = /** @class */ (function (_super) {
+    __extends(Wink, _super);
+    function Wink() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Wink.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyes/Wink-\uD83D\uDE09', transform: 'translate(0.000000, 8.000000)', fillOpacity: '0.599999964' },
+            React.createElement("circle", { id: 'Eye', cx: '30', cy: '22', r: '6' }),
+            React.createElement("path", { d: 'M70.4123979,24.204889 C72.2589064,20.4060854 76.4166529,17.7575774 81.2498107,17.7575774 C86.065907,17.7575774 90.2113521,20.3874194 92.0675822,24.1647016 C92.618991,25.2867751 91.8343342,26.2050591 91.0428374,25.5246002 C88.5917368,23.4173607 85.1109468,22.1013658 81.2498107,22.1013658 C77.5094365,22.1013658 74.1259889,23.3363293 71.6897696,25.3292186 C70.7990233,26.0578718 69.8723316,25.3159619 70.4123979,24.204889 Z', id: 'Winky-Wink', transform: 'translate(81.252230, 21.757577) rotate(-4.000000) translate(-81.252230, -21.757577) ' })));
+    };
+    Wink.optionValue = 'Wink';
+    return Wink;
+}(React.Component));
+exports.default = Wink;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/WinkWacky.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/WinkWacky.d.ts
new file mode 100644
index 000000000..a6e4d56c0
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/WinkWacky.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class WinkWacky extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/WinkWacky.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/WinkWacky.js
new file mode 100644
index 000000000..5f0a14247
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/WinkWacky.js
@@ -0,0 +1,31 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var WinkWacky = /** @class */ (function (_super) {
+    __extends(WinkWacky, _super);
+    function WinkWacky() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    WinkWacky.prototype.render = function () {
+        return (React.createElement("g", { id: 'Eyes/Wink-Wacky-\uD83D\uDE1C', transform: 'translate(0.000000, 8.000000)' },
+            React.createElement("circle", { id: 'Cornea?-I-don\'t-know', fill: '#FFFFFF', cx: '82', cy: '22', r: '12' }),
+            React.createElement("circle", { id: 'Eye', fillOpacity: '0.699999988', fill: '#000000', cx: '82', cy: '22', r: '6' }),
+            React.createElement("path", { d: 'M16.1601674,25.4473116 C18.006676,21.648508 22.1644225,19 26.9975803,19 C31.8136766,19 35.9591217,21.629842 37.8153518,25.4071242 C38.3667605,26.5291977 37.5821037,27.4474817 36.790607,26.7670228 C34.3395063,24.6597833 30.8587163,23.3437884 26.9975803,23.3437884 C23.2572061,23.3437884 19.8737584,24.5787519 17.4375392,26.5716412 C16.5467928,27.3002944 15.6201012,26.5583844 16.1601674,25.4473116 Z', id: 'Winky-Doodle', fillOpacity: '0.599999964', fill: '#000000' })));
+    };
+    WinkWacky.optionValue = 'WinkWacky';
+    return WinkWacky;
+}(React.Component));
+exports.default = WinkWacky;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/index.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/index.d.ts
new file mode 100644
index 000000000..253cf904d
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/index.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+export default class Eyes extends React.Component {
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/index.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/index.js
new file mode 100644
index 000000000..6c4ec0ee4
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/eyes/index.js
@@ -0,0 +1,52 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Close_1 = require("./Close");
+var Cry_1 = require("./Cry");
+var Default_1 = require("./Default");
+var Dizzy_1 = require("./Dizzy");
+var EyeRoll_1 = require("./EyeRoll");
+var Happy_1 = require("./Happy");
+var Hearts_1 = require("./Hearts");
+var Side_1 = require("./Side");
+var Squint_1 = require("./Squint");
+var Surprised_1 = require("./Surprised");
+var Wink_1 = require("./Wink");
+var WinkWacky_1 = require("./WinkWacky");
+var options_1 = require("../../../options");
+var Eyes = /** @class */ (function (_super) {
+    __extends(Eyes, _super);
+    function Eyes() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Eyes.prototype.render = function () {
+        return (React.createElement(options_1.Selector, { defaultOption: Default_1.default, option: options_1.EyesOption },
+            React.createElement(Close_1.default, null),
+            React.createElement(Cry_1.default, null),
+            React.createElement(Default_1.default, null),
+            React.createElement(Dizzy_1.default, null),
+            React.createElement(EyeRoll_1.default, null),
+            React.createElement(Happy_1.default, null),
+            React.createElement(Hearts_1.default, null),
+            React.createElement(Side_1.default, null),
+            React.createElement(Squint_1.default, null),
+            React.createElement(Surprised_1.default, null),
+            React.createElement(Wink_1.default, null),
+            React.createElement(WinkWacky_1.default, null)));
+    };
+    return Eyes;
+}(React.Component));
+exports.default = Eyes;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/index.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/index.d.ts
new file mode 100644
index 000000000..492929d9c
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/index.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+export default class Face extends React.Component {
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/index.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/index.js
new file mode 100644
index 000000000..33760dc75
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/index.js
@@ -0,0 +1,35 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var eyebrow_1 = require("./eyebrow");
+var eyes_1 = require("./eyes");
+var mouth_1 = require("./mouth");
+var Default_1 = require("./nose/Default");
+var Face = /** @class */ (function (_super) {
+    __extends(Face, _super);
+    function Face() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Face.prototype.render = function () {
+        return (React.createElement("g", { id: 'Face', transform: 'translate(76.000000, 82.000000)', fill: '#000000' },
+            React.createElement(mouth_1.default, null),
+            React.createElement(Default_1.default, null),
+            React.createElement(eyes_1.default, null),
+            React.createElement(eyebrow_1.default, null)));
+    };
+    return Face;
+}(React.Component));
+exports.default = Face;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Concerned.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Concerned.d.ts
new file mode 100644
index 000000000..114a8b5cd
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Concerned.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class Concerned extends React.Component {
+    static optionValue: string;
+    private path1;
+    private mask1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Concerned.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Concerned.js
new file mode 100644
index 000000000..ec8b2d58d
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Concerned.js
@@ -0,0 +1,43 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Concerned = /** @class */ (function (_super) {
+    __extends(Concerned, _super);
+    function Concerned() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        return _this;
+    }
+    Concerned.prototype.render = function () {
+        var _a = this, path1 = _a.path1, mask1 = _a.mask1;
+        return (React.createElement("g", { id: 'Mouth/Concerned', transform: 'translate(2.000000, 52.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M35.117844,15.1280772 C36.1757121,24.6198025 44.2259873,32 54,32 C63.8042055,32 71.8740075,24.574136 72.8917593,15.0400546 C72.9736685,14.272746 72.1167429,13 71.042767,13 C56.1487536,13 44.7379213,13 37.0868244,13 C36.0066168,13 35.0120058,14.1784435 35.117844,15.1280772 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1, transform: 'translate(54.003637, 22.500000) scale(1, -1) translate(-54.003637, -22.500000) ' })),
+            React.createElement("use", { id: 'Mouth', fillOpacity: '0.699999988', fill: '#000000', fillRule: 'evenodd', transform: 'translate(54.003637, 22.500000) scale(1, -1) translate(-54.003637, -22.500000) ', xlinkHref: '#' + path1 }),
+            React.createElement("rect", { id: 'Teeth', fill: '#FFFFFF', fillRule: 'evenodd', mask: "url(#" + mask1 + ")", x: '39', y: '2', width: '31', height: '16', rx: '5' }),
+            React.createElement("g", { id: 'Tongue', strokeWidth: '1', fillRule: 'evenodd', mask: "url(#" + mask1 + ")", fill: '#FF4F6D' },
+                React.createElement("g", { transform: 'translate(38.000000, 24.000000)' },
+                    React.createElement("circle", { id: 'friend?', cx: '11', cy: '11', r: '11' }),
+                    React.createElement("circle", { id: 'How-you-doing', cx: '21', cy: '11', r: '11' })))));
+    };
+    Concerned.optionValue = 'Concerned';
+    return Concerned;
+}(React.Component));
+exports.default = Concerned;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Default.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Default.d.ts
new file mode 100644
index 000000000..4f5b3fa73
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Default.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Default extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Default.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Default.js
new file mode 100644
index 000000000..0cf17b256
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Default.js
@@ -0,0 +1,29 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Default = /** @class */ (function (_super) {
+    __extends(Default, _super);
+    function Default() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Default.prototype.render = function () {
+        return (React.createElement("g", { id: 'Mouth/Default', transform: 'translate(2.000000, 52.000000)', fillOpacity: '0.699999988' },
+            React.createElement("path", { d: 'M40,15 C40,22.7319865 46.2680135,29 54,29 L54,29 C61.7319865,29 68,22.7319865 68,15', id: 'Mouth' })));
+    };
+    Default.optionValue = 'Default';
+    return Default;
+}(React.Component));
+exports.default = Default;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Disbelief.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Disbelief.d.ts
new file mode 100644
index 000000000..40b59c7c4
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Disbelief.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Disbelief extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Disbelief.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Disbelief.js
new file mode 100644
index 000000000..7cb4b8c3f
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Disbelief.js
@@ -0,0 +1,29 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Disbelief = /** @class */ (function (_super) {
+    __extends(Disbelief, _super);
+    function Disbelief() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Disbelief.prototype.render = function () {
+        return (React.createElement("g", { id: 'Mouth/Disbelief', transform: 'translate(2.000000, 52.000000)', fillOpacity: '0.699999988', fill: '#000000' },
+            React.createElement("path", { d: 'M40,15 C40,22.7319865 46.2680135,29 54,29 L54,29 C61.7319865,29 68,22.7319865 68,15', id: 'Mouth', transform: 'translate(54.000000, 22.000000) scale(1, -1) translate(-54.000000, -22.000000) ' })));
+    };
+    Disbelief.optionValue = 'Disbelief';
+    return Disbelief;
+}(React.Component));
+exports.default = Disbelief;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Eating.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Eating.d.ts
new file mode 100644
index 000000000..075de8f24
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Eating.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Eating extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Eating.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Eating.js
new file mode 100644
index 000000000..3940fb0c1
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Eating.js
@@ -0,0 +1,32 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Eating = /** @class */ (function (_super) {
+    __extends(Eating, _super);
+    function Eating() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Eating.prototype.render = function () {
+        return (React.createElement("g", { id: 'Mouth/Eating', transform: 'translate(2.000000, 52.000000)' },
+            React.createElement("g", { id: 'Om-Nom-Nom', opacity: '0.599999964', strokeWidth: '1', transform: 'translate(28.000000, 6.000000)', fillOpacity: '0.599999964', fill: '#000000' },
+                React.createElement("path", { d: 'M16.1906378,10.106319 C16.0179484,4.99553347 11.7923466,0.797193688 6.29352385,0 C9.66004124,1.95870633 11.9804619,5.49520667 11.9804619,9.67694348 C11.9804619,15.344608 6.50694731,20.2451296 0.176591694,20.2451296 C0.11761218,20.2451296 0.0587475828,20.2447983 0,20.244138 L8.8963743e-11,20.244138 C1.35764479,20.7317259 2.83995964,21 4.39225962,21 C9.71395931,21 14.2131224,17.8469699 15.6863572,13.5136402 C18.1609431,15.6698775 21.8629994,17.0394229 26,17.0394229 C30.1370006,17.0394229 33.8390569,15.6698775 36.3136428,13.5136402 C37.7868776,17.8469699 42.2860407,21 47.6077404,21 C49.1600404,21 50.6423552,20.7317259 52,20.244138 L52,20.244138 C51.9412524,20.2447983 51.8823878,20.2451296 51.8234083,20.2451296 C45.4930527,20.2451296 40.0195381,15.344608 40.0195381,9.67694348 C40.0195381,5.49520667 42.3399588,1.95870633 45.7064761,0 C40.2076534,0.797193688 35.9820516,4.99553347 35.8093622,10.106319 C33.2452605,11.8422828 29.7948543,12.9056086 26,12.9056086 C22.2051457,12.9056086 18.7547395,11.8422828 16.1906378,10.106319 Z', id: 'Delicious' })),
+            React.createElement("circle", { id: 'Redish', fillOpacity: '0.2', fill: '#FF4646', cx: '17', cy: '15', r: '9' }),
+            React.createElement("circle", { id: 'Redish', fillOpacity: '0.2', fill: '#FF4646', cx: '91', cy: '15', r: '9' })));
+    };
+    Eating.optionValue = 'Eating';
+    return Eating;
+}(React.Component));
+exports.default = Eating;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Grimace.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Grimace.d.ts
new file mode 100644
index 000000000..f426d1353
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Grimace.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class Grimace extends React.Component {
+    static optionValue: string;
+    private path1;
+    private mask1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Grimace.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Grimace.js
new file mode 100644
index 000000000..458e09e37
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Grimace.js
@@ -0,0 +1,40 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Grimace = /** @class */ (function (_super) {
+    __extends(Grimace, _super);
+    function Grimace() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        return _this;
+    }
+    Grimace.prototype.render = function () {
+        var _a = this, path1 = _a.path1, mask1 = _a.mask1;
+        return (React.createElement("g", { id: 'Mouth/Grimace', transform: 'translate(2.000000, 52.000000)' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '24', y: '9', width: '60', height: '22', rx: '11' })),
+            React.createElement("rect", { id: 'Mouth', fillOpacity: '0.599999964', fill: '#000000', fillRule: 'evenodd', x: '22', y: '7', width: '64', height: '26', rx: '13' }),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("use", { id: 'Mouth', fill: '#FFFFFF', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+            React.createElement("path", { d: 'M71,22 L62,22 L62,34 L58,34 L58,22 L49,22 L49,34 L45,34 L45,22 L36,22 L36,34 L32,34 L32,22 L24,22 L24,18 L32,18 L32,6 L36,6 L36,18 L45,18 L45,6 L49,6 L49,18 L58,18 L58,6 L62,6 L62,18 L71,18 L71,6 L75,6 L75,18 L83.8666667,18 L83.8666667,22 L75,22 L75,34 L71,34 L71,22 Z', id: 'Grimace-Teeth', fill: '#E6E6E6', fillRule: 'evenodd', mask: "url(#" + mask1 + ")" })));
+    };
+    Grimace.optionValue = 'Grimace';
+    return Grimace;
+}(React.Component));
+exports.default = Grimace;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Sad.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Sad.d.ts
new file mode 100644
index 000000000..f6e666d33
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Sad.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Sad extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Sad.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Sad.js
new file mode 100644
index 000000000..0731f7432
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Sad.js
@@ -0,0 +1,29 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Sad = /** @class */ (function (_super) {
+    __extends(Sad, _super);
+    function Sad() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Sad.prototype.render = function () {
+        return (React.createElement("g", { id: 'Mouth/Sad', transform: 'translate(2.000000, 52.000000)', fillOpacity: '0.699999988', fill: '#000000' },
+            React.createElement("path", { d: 'M40.0582943,16.6539438 C40.7076459,23.6831146 46.7016363,28.3768187 54,28.3768187 C61.3416045,28.3768187 67.3633339,23.627332 67.9526838,16.5287605 C67.9840218,16.1513016 67.0772329,15.8529531 66.6289111,16.077395 C61.0902255,18.8502083 56.8805885,20.2366149 54,20.2366149 C51.1558456,20.2366149 47.0072148,18.8804569 41.5541074,16.168141 C41.0473376,15.9160792 40.0197139,16.2363147 40.0582943,16.6539438 Z', id: 'Mouth', transform: 'translate(54.005357, 22.188409) scale(1, -1) translate(-54.005357, -22.188409) ' })));
+    };
+    Sad.optionValue = 'Sad';
+    return Sad;
+}(React.Component));
+exports.default = Sad;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/ScreamOpen.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/ScreamOpen.d.ts
new file mode 100644
index 000000000..bfd52fd5c
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/ScreamOpen.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class ScreamOpen extends React.Component {
+    static optionValue: string;
+    private path1;
+    private mask1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/ScreamOpen.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/ScreamOpen.js
new file mode 100644
index 000000000..8cf68d05d
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/ScreamOpen.js
@@ -0,0 +1,43 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var ScreamOpen = /** @class */ (function (_super) {
+    __extends(ScreamOpen, _super);
+    function ScreamOpen() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        return _this;
+    }
+    ScreamOpen.prototype.render = function () {
+        var _a = this, path1 = _a.path1, mask1 = _a.mask1;
+        return (React.createElement("g", { id: 'Mouth/Scream-Open', transform: 'translate(2.000000, 52.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M34.0082051,15.1361102 C35.1280248,29.123916 38.2345159,40.9925405 53.9961505,40.9999965 C69.757785,41.0074525 72.9169073,29.0566179 73.9942614,15.0063928 C74.0809675,13.8756222 73.1738581,12.9999965 72.0369872,12.9999965 C65.3505138,12.9999965 62.6703194,14.9936002 53.9894323,14.9999965 C45.3085452,15.0063928 40.7567994,12.9999965 36.0924943,12.9999965 C34.9490269,12.9999965 33.8961688,13.7366502 34.0082051,15.1361102 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1, transform: 'translate(54.000000, 26.999998) scale(1, -1) translate(-54.000000, -26.999998) ' })),
+            React.createElement("use", { id: 'Mouth', fillOpacity: '0.699999988', fill: '#000000', fillRule: 'evenodd', transform: 'translate(54.000000, 26.999998) scale(1, -1) translate(-54.000000, -26.999998) ', xlinkHref: '#' + path1 }),
+            React.createElement("rect", { id: 'Teeth', fill: '#FFFFFF', fillRule: 'evenodd', mask: "url(#" + mask1 + ")", x: '39', y: '2', width: '31', height: '16', rx: '5' }),
+            React.createElement("g", { id: 'Tongue', strokeWidth: '1', fillRule: 'evenodd', mask: "url(#" + mask1 + ")", fill: '#FF4F6D' },
+                React.createElement("g", { transform: 'translate(38.000000, 32.000000)', id: 'Say-ahhhh' },
+                    React.createElement("circle", { cx: '11', cy: '11', r: '11' }),
+                    React.createElement("circle", { cx: '21', cy: '11', r: '11' })))));
+    };
+    ScreamOpen.optionValue = 'ScreamOpen';
+    return ScreamOpen;
+}(React.Component));
+exports.default = ScreamOpen;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Serious.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Serious.d.ts
new file mode 100644
index 000000000..b731b0d0a
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Serious.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Serious extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Serious.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Serious.js
new file mode 100644
index 000000000..12e85e693
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Serious.js
@@ -0,0 +1,29 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Serious = /** @class */ (function (_super) {
+    __extends(Serious, _super);
+    function Serious() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Serious.prototype.render = function () {
+        return (React.createElement("g", { id: 'Mouth/Serious', transform: 'translate(2.000000, 52.000000)', fill: '#000000', fillOpacity: '0.699999988' },
+            React.createElement("rect", { id: 'Why-so-serious?', x: '42', y: '18', width: '24', height: '6', rx: '3' })));
+    };
+    Serious.optionValue = 'Serious';
+    return Serious;
+}(React.Component));
+exports.default = Serious;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Smile.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Smile.d.ts
new file mode 100644
index 000000000..352c65b46
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Smile.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class Smile extends React.Component {
+    static optionValue: string;
+    private path1;
+    private mask1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Smile.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Smile.js
new file mode 100644
index 000000000..c7d1131e3
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Smile.js
@@ -0,0 +1,43 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Smile = /** @class */ (function (_super) {
+    __extends(Smile, _super);
+    function Smile() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        return _this;
+    }
+    Smile.prototype.render = function () {
+        var _a = this, path1 = _a.path1, mask1 = _a.mask1;
+        return (React.createElement("g", { id: 'Mouth/Smile', transform: 'translate(2.000000, 52.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M35.117844,15.1280772 C36.1757121,24.6198025 44.2259873,32 54,32 C63.8042055,32 71.8740075,24.574136 72.8917593,15.0400546 C72.9736685,14.272746 72.1167429,13 71.042767,13 C56.1487536,13 44.7379213,13 37.0868244,13 C36.0066168,13 35.0120058,14.1784435 35.117844,15.1280772 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("use", { id: 'Mouth', fillOpacity: '0.699999988', fill: '#000000', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+            React.createElement("rect", { id: 'Teeth', fill: '#FFFFFF', fillRule: 'evenodd', mask: "url(#" + mask1 + ")", x: '39', y: '2', width: '31', height: '16', rx: '5' }),
+            React.createElement("g", { id: 'Tongue', strokeWidth: '1', fillRule: 'evenodd', mask: "url(#" + mask1 + ")", fill: '#FF4F6D' },
+                React.createElement("g", { transform: 'translate(38.000000, 24.000000)' },
+                    React.createElement("circle", { cx: '11', cy: '11', r: '11' }),
+                    React.createElement("circle", { cx: '21', cy: '11', r: '11' })))));
+    };
+    Smile.optionValue = 'Smile';
+    return Smile;
+}(React.Component));
+exports.default = Smile;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Tongue.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Tongue.d.ts
new file mode 100644
index 000000000..ed6d89d7b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Tongue.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class Tongue extends React.Component {
+    static optionValue: string;
+    private path1;
+    private mask1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Tongue.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Tongue.js
new file mode 100644
index 000000000..834b05b3f
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Tongue.js
@@ -0,0 +1,40 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Tongue = /** @class */ (function (_super) {
+    __extends(Tongue, _super);
+    function Tongue() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        return _this;
+    }
+    Tongue.prototype.render = function () {
+        var _a = this, path1 = _a.path1, mask1 = _a.mask1;
+        return (React.createElement("g", { id: 'Mouth/Tongue', transform: 'translate(2.000000, 52.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M29,15.6086957 C30.410031,25.2313711 41.062182,33 54,33 C66.9681454,33 77.6461342,25.183301 79,14.7391304 C79.1012093,14.3397326 78.775269,13 76.826087,13 C56.838426,13 41.7395748,13 31.173913,13 C29.3833142,13 28.870211,14.2404669 29,15.6086957 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("use", { id: 'Mouth', fillOpacity: '0.699999988', fill: '#000000', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+            React.createElement("rect", { id: 'Teeth', fill: '#FFFFFF', fillRule: 'evenodd', mask: "url(#" + mask1 + ")", x: '39', y: '2', width: '31', height: '16', rx: '5' }),
+            React.createElement("path", { d: 'M65.9841079,23.7466656 C65.9945954,23.8296335 66,23.9141856 66,24 L66,33 C66,39.0751322 61.0751322,44 55,44 L54,44 C47.9248678,44 43,39.0751322 43,33 L43,24 L43,24 C43,23.9141856 43.0054046,23.8296335 43.0158921,23.7466656 C43.0053561,23.6651805 43,23.5829271 43,23.5 C43,21.5670034 45.9101491,20 49.5,20 C51.510438,20 53.3076958,20.4914717 54.5,21.2634601 C55.6923042,20.4914717 57.489562,20 59.5,20 C63.0898509,20 66,21.5670034 66,23.5 C66,23.5829271 65.9946439,23.6651805 65.9841079,23.7466656 Z', id: 'Tongue', fill: '#FF4F6D', fillRule: 'evenodd' })));
+    };
+    Tongue.optionValue = 'Tongue';
+    return Tongue;
+}(React.Component));
+exports.default = Tongue;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Twinkle.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Twinkle.d.ts
new file mode 100644
index 000000000..f1e3b3c1c
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Twinkle.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Twinkle extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Twinkle.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Twinkle.js
new file mode 100644
index 000000000..2209fa094
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Twinkle.js
@@ -0,0 +1,29 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Twinkle = /** @class */ (function (_super) {
+    __extends(Twinkle, _super);
+    function Twinkle() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Twinkle.prototype.render = function () {
+        return (React.createElement("g", { id: 'Mouth/Twinkle', transform: 'translate(2.000000, 52.000000)', fillOpacity: '0.599999964', fillRule: 'nonzero', fill: '#000000' },
+            React.createElement("path", { d: 'M40,16 C40,21.371763 46.1581544,25 54,25 C61.8418456,25 68,21.371763 68,16 C68,14.8954305 67.050301,14 66,14 C64.7072748,14 64.1302316,14.9051755 64,16 C62.7575758,18.9378973 59.6832595,20.7163149 54,21 C48.3167405,20.7163149 45.2424242,18.9378973 44,16 C43.8697684,14.9051755 43.2927252,14 42,14 C40.949699,14 40,14.8954305 40,16 Z', id: 'Mouth' })));
+    };
+    Twinkle.optionValue = 'Twinkle';
+    return Twinkle;
+}(React.Component));
+exports.default = Twinkle;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Vomit.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Vomit.d.ts
new file mode 100644
index 000000000..bf134161e
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Vomit.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+export default class Vomit extends React.Component {
+    static optionValue: string;
+    private path1;
+    private path2;
+    private mask1;
+    private filter1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Vomit.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Vomit.js
new file mode 100644
index 000000000..324b44954
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/Vomit.js
@@ -0,0 +1,49 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Vomit = /** @class */ (function (_super) {
+    __extends(Vomit, _super);
+    function Vomit() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        return _this;
+    }
+    Vomit.prototype.render = function () {
+        var _a = this, path1 = _a.path1, path2 = _a.path2, filter1 = _a.filter1, mask1 = _a.mask1;
+        return (React.createElement("g", { id: 'Mouth/Vomit', transform: 'translate(2.000000, 52.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M34.0082051,12.6020819 C35.1280248,23.0929366 38.2345159,31.9944054 53.9961505,31.9999974 C69.757785,32.0055894 72.9169073,23.0424631 73.9942614,12.5047938 C74.0809675,11.6567158 73.1738581,10.9999965 72.0369872,10.9999965 C65.3505138,10.9999965 62.6703194,12.4951994 53.9894323,12.4999966 C45.3085452,12.5047938 40.7567994,10.9999965 36.0924943,10.9999965 C34.9490269,10.9999965 33.8961688,11.5524868 34.0082051,12.6020819 Z', id: path1 }),
+                React.createElement("path", { d: 'M59.9170416,36 L60,36 C60,39.3137085 62.6862915,42 66,42 C69.3137085,42 72,39.3137085 72,36 L72,35 L72,31 C72,27.6862915 69.3137085,25 66,25 L66,25 L42,25 L42,25 C38.6862915,25 36,27.6862915 36,31 L36,31 L36,35 L36,38 C36,41.3137085 38.6862915,44 42,44 C45.3137085,44 48,41.3137085 48,38 L48,36 L48.0829584,36 C48.5590365,33.1622867 51.0270037,31 54,31 C56.9729963,31 59.4409635,33.1622867 59.9170416,36 Z', id: path2 }),
+                React.createElement("filter", { x: '-1.4%', y: '-2.6%', width: '102.8%', height: '105.3%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '-1', in: 'SourceAlpha', result: 'shadowOffsetInner1' }),
+                    React.createElement("feComposite", { in: 'shadowOffsetInner1', in2: 'SourceAlpha', operator: 'arithmetic', k2: '-1', k3: '1', result: 'shadowInnerInner1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0', type: 'matrix', in: 'shadowInnerInner1' }))),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1, transform: 'translate(54.000000, 21.499998) scale(1, -1) translate(-54.000000, -21.499998) ' })),
+            React.createElement("use", { id: 'Mouth', fillOpacity: '0.699999988', fill: '#000000', fillRule: 'evenodd', transform: 'translate(54.000000, 21.499998) scale(1, -1) translate(-54.000000, -21.499998) ', xlinkHref: '#' + path1 }),
+            React.createElement("rect", { id: 'Teeth', fill: '#FFFFFF', fillRule: 'evenodd', mask: "url(#" + mask1 + ")", x: '39', y: '0', width: '31', height: '16', rx: '5' }),
+            React.createElement("g", { id: 'Vomit-Stuff' },
+                React.createElement("use", { fill: '#88C553', fillRule: 'evenodd', xlinkHref: '#' + path2 }),
+                React.createElement("use", { fill: 'black', fillOpacity: '1', filter: "url(#" + filter1 + ")", xlinkHref: '#' + path2 }))));
+    };
+    Vomit.optionValue = 'Vomit';
+    return Vomit;
+}(React.Component));
+exports.default = Vomit;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/index.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/index.d.ts
new file mode 100644
index 000000000..ff9384078
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/index.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+export default class Mouth extends React.Component {
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/index.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/index.js
new file mode 100644
index 000000000..bce3d10b9
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/mouth/index.js
@@ -0,0 +1,52 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Concerned_1 = require("./Concerned");
+var Default_1 = require("./Default");
+var Disbelief_1 = require("./Disbelief");
+var Eating_1 = require("./Eating");
+var Grimace_1 = require("./Grimace");
+var Sad_1 = require("./Sad");
+var ScreamOpen_1 = require("./ScreamOpen");
+var Serious_1 = require("./Serious");
+var Smile_1 = require("./Smile");
+var Tongue_1 = require("./Tongue");
+var Twinkle_1 = require("./Twinkle");
+var Vomit_1 = require("./Vomit");
+var options_1 = require("../../../options");
+var Mouth = /** @class */ (function (_super) {
+    __extends(Mouth, _super);
+    function Mouth() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Mouth.prototype.render = function () {
+        return (React.createElement(options_1.Selector, { defaultOption: Default_1.default, option: options_1.MouthOption },
+            React.createElement(Concerned_1.default, null),
+            React.createElement(Default_1.default, null),
+            React.createElement(Disbelief_1.default, null),
+            React.createElement(Eating_1.default, null),
+            React.createElement(Grimace_1.default, null),
+            React.createElement(Sad_1.default, null),
+            React.createElement(ScreamOpen_1.default, null),
+            React.createElement(Serious_1.default, null),
+            React.createElement(Smile_1.default, null),
+            React.createElement(Tongue_1.default, null),
+            React.createElement(Twinkle_1.default, null),
+            React.createElement(Vomit_1.default, null)));
+    };
+    return Mouth;
+}(React.Component));
+exports.default = Mouth;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/nose/Default.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/nose/Default.d.ts
new file mode 100644
index 000000000..4f5b3fa73
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/nose/Default.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Default extends React.Component {
+    static optionValue: string;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/nose/Default.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/nose/Default.js
new file mode 100644
index 000000000..d3a9d0fee
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/nose/Default.js
@@ -0,0 +1,29 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Default = /** @class */ (function (_super) {
+    __extends(Default, _super);
+    function Default() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Default.prototype.render = function () {
+        return (React.createElement("g", { id: 'Nose/Default', transform: 'translate(28.000000, 40.000000)', fillOpacity: '0.16' },
+            React.createElement("path", { d: 'M16,8 C16,12.418278 21.372583,16 28,16 L28,16 C34.627417,16 40,12.418278 40,8', id: 'Nose' })));
+    };
+    Default.optionValue = 'Default';
+    return Default;
+}(React.Component));
+exports.default = Default;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/nose/index.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/nose/index.d.ts
new file mode 100644
index 000000000..256755880
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/nose/index.d.ts
@@ -0,0 +1 @@
+export { default } from './Default';
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/nose/index.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/nose/index.js
new file mode 100644
index 000000000..cee9751ca
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/face/nose/index.js
@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var Default_1 = require("./Default");
+exports.default = Default_1.default;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/index.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/index.d.ts
new file mode 100644
index 000000000..da3f42cde
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/index.d.ts
@@ -0,0 +1,12 @@
+import * as React from 'react';
+export declare enum AvatarStyle {
+    Circle = "Circle",
+    Transparent = "Transparent"
+}
+export interface Props {
+    avatarStyle: AvatarStyle;
+    style?: React.CSSProperties;
+}
+export default class Avatar extends React.Component<Props> {
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/index.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/index.js
new file mode 100644
index 000000000..78ab0cf08
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/index.js
@@ -0,0 +1,67 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var accessories_1 = require("./top/accessories");
+var clothes_1 = require("./clothes");
+var face_1 = require("./face");
+var Skin_1 = require("./Skin");
+var top_1 = require("./top");
+var AvatarStyle;
+(function (AvatarStyle) {
+    AvatarStyle["Circle"] = "Circle";
+    AvatarStyle["Transparent"] = "Transparent";
+})(AvatarStyle = exports.AvatarStyle || (exports.AvatarStyle = {}));
+var Avatar = /** @class */ (function (_super) {
+    __extends(Avatar, _super);
+    function Avatar() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Avatar.prototype.render = function () {
+        var avatarStyle = this.props.avatarStyle;
+        var circle = avatarStyle === AvatarStyle.Circle;
+        return (React.createElement("svg", { style: this.props.style, width: '264px', height: '280px', viewBox: '0 0 264 280', version: '1.1', xmlns: 'http://www.w3.org/2000/svg', xmlnsXlink: 'http://www.w3.org/1999/xlink' },
+            React.createElement("desc", null, "Created with getavataaars.com"),
+            React.createElement("defs", null,
+                React.createElement("circle", { id: 'path-1', cx: '120', cy: '120', r: '120' }),
+                React.createElement("path", { d: 'M12,160 C12,226.27417 65.72583,280 132,280 C198.27417,280 252,226.27417 252,160 L264,160 L264,-1.42108547e-14 L-3.19744231e-14,-1.42108547e-14 L-3.19744231e-14,160 L12,160 Z', id: 'path-3' }),
+                React.createElement("path", { d: 'M124,144.610951 L124,163 L128,163 L128,163 C167.764502,163 200,195.235498 200,235 L200,244 L0,244 L0,235 C-4.86974701e-15,195.235498 32.235498,163 72,163 L72,163 L76,163 L76,144.610951 C58.7626345,136.422372 46.3722246,119.687011 44.3051388,99.8812385 C38.4803105,99.0577866 34,94.0521096 34,88 L34,74 C34,68.0540074 38.3245733,63.1180731 44,62.1659169 L44,56 L44,56 C44,25.072054 69.072054,5.68137151e-15 100,0 L100,0 L100,0 C130.927946,-5.68137151e-15 156,25.072054 156,56 L156,62.1659169 C161.675427,63.1180731 166,68.0540074 166,74 L166,88 C166,94.0521096 161.51969,99.0577866 155.694861,99.8812385 C153.627775,119.687011 141.237365,136.422372 124,144.610951 Z', id: 'path-5' })),
+            React.createElement("g", { id: 'Avataaar', stroke: 'none', strokeWidth: '1', fill: 'none', fillRule: 'evenodd' },
+                React.createElement("g", { transform: 'translate(-825.000000, -1100.000000)', id: 'Avataaar/Circle' },
+                    React.createElement("g", { transform: 'translate(825.000000, 1100.000000)' },
+                        circle ? (React.createElement("g", { id: 'Circle', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(12.000000, 40.000000)' },
+                            React.createElement("mask", { id: 'mask-2', fill: 'white' },
+                                React.createElement("use", { xlinkHref: '#path-1' })),
+                            React.createElement("use", { id: 'Circle-Background', fill: '#E6E6E6', xlinkHref: '#path-1' }),
+                            React.createElement("g", { id: 'Color/Palette/Blue-01', mask: 'url(#mask-2)', fill: '#65C9FF' },
+                                React.createElement("rect", { id: '\uD83D\uDD8DColor', x: '0', y: '0', width: '240', height: '240' })))) : null,
+                        circle ? (React.createElement("mask", { id: 'mask-4', fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#path-3' }))) : null,
+                        React.createElement("g", { id: 'Mask' }),
+                        React.createElement("g", { id: 'Avataaar', strokeWidth: '1', fillRule: 'evenodd', mask: 'url(#mask-4)' },
+                            React.createElement("g", { id: 'Body', transform: 'translate(32.000000, 36.000000)' },
+                                React.createElement("mask", { id: 'mask-6', fill: 'white' },
+                                    React.createElement("use", { xlinkHref: '#path-5' })),
+                                React.createElement("use", { fill: '#D0C6AC', xlinkHref: '#path-5' }),
+                                React.createElement(Skin_1.default, { maskID: 'mask-6' }),
+                                React.createElement("path", { d: 'M156,79 L156,102 C156,132.927946 130.927946,158 100,158 C69.072054,158 44,132.927946 44,102 L44,79 L44,94 C44,124.927946 69.072054,150 100,150 C130.927946,150 156,124.927946 156,94 L156,79 Z', id: 'Neck-Shadow', fillOpacity: '0.100000001', fill: '#000000', mask: 'url(#mask-6)' })),
+                            React.createElement(clothes_1.default, null),
+                            React.createElement(face_1.default, null),
+                            React.createElement(top_1.default, null,
+                                React.createElement(accessories_1.default, null))))))));
+    };
+    return Avatar;
+}(React.Component));
+exports.default = Avatar;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/piece.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/piece.d.ts
new file mode 100644
index 000000000..d5087f3a7
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/piece.d.ts
@@ -0,0 +1,14 @@
+import * as React from 'react';
+export declare enum AvatarStyle {
+    Circle = "Circle",
+    Transparent = "Transparent"
+}
+export interface Props {
+    pieceSize?: string;
+    pieceType?: string;
+    avatarStyle: AvatarStyle;
+    style?: React.CSSProperties;
+}
+export default class PieceComponent extends React.Component<Props> {
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/piece.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/piece.js
new file mode 100644
index 000000000..3dce12343
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/piece.js
@@ -0,0 +1,53 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var clothes_1 = require("./clothes");
+var Graphics_1 = require("./clothes/Graphics");
+var accessories_1 = require("./top/accessories");
+var facialHair_1 = require("./top/facialHair");
+var top_1 = require("./top");
+var eyes_1 = require("./face/eyes");
+var eyebrow_1 = require("./face/eyebrow");
+var mouth_1 = require("./face/mouth");
+var nose_1 = require("./face/nose");
+var Skin_1 = require("./Skin");
+var AvatarStyle;
+(function (AvatarStyle) {
+    AvatarStyle["Circle"] = "Circle";
+    AvatarStyle["Transparent"] = "Transparent";
+})(AvatarStyle = exports.AvatarStyle || (exports.AvatarStyle = {}));
+var PieceComponent = /** @class */ (function (_super) {
+    __extends(PieceComponent, _super);
+    function PieceComponent() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    PieceComponent.prototype.render = function () {
+        return (React.createElement("svg", { style: this.props.style, width: this.props.pieceSize + "px", height: this.props.pieceSize + "px", viewBox: "0 0 264 280", version: "1.1", xmlns: "http://www.w3.org/2000/svg", xmlnsXlink: "http://www.w3.org/1999/xlink" },
+            this.props.pieceType === 'top' && React.createElement(top_1.default, null),
+            this.props.pieceType === 'clothe' && React.createElement(clothes_1.default, null),
+            this.props.pieceType === 'graphics' && React.createElement(Graphics_1.default, { maskID: "1234" }),
+            (this.props.pieceType === 'accessories' ||
+                this.props.pieceType === 'accesories') && React.createElement(accessories_1.default, null),
+            this.props.pieceType === 'facialHair' && React.createElement(facialHair_1.default, null),
+            this.props.pieceType === 'eyes' && React.createElement(eyes_1.default, null),
+            this.props.pieceType === 'eyebrows' && React.createElement(eyebrow_1.default, null),
+            this.props.pieceType === 'mouth' && React.createElement(mouth_1.default, null),
+            this.props.pieceType === 'nose' && React.createElement(nose_1.default, null),
+            this.props.pieceType === 'skin' && React.createElement(Skin_1.default, { maskID: "5678" })));
+    };
+    return PieceComponent;
+}(React.Component));
+exports.default = PieceComponent;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Eyepatch.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Eyepatch.d.ts
new file mode 100644
index 000000000..25ff242f0
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Eyepatch.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class Eyepatch extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private path1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Eyepatch.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Eyepatch.js
new file mode 100644
index 000000000..14efe5ca9
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Eyepatch.js
@@ -0,0 +1,43 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var Eyepatch = /** @class */ (function (_super) {
+    __extends(Eyepatch, _super);
+    function Eyepatch() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    Eyepatch.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, path1 = _a.path1;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Accesories/Eyepatch', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement(facialHair_1.default, null),
+                    React.createElement("path", { d: 'M160.395307,39.7810237 C157.318088,36.6927979 154.11865,43.6386608 152.623361,45.4281124 C149.013122,49.7486528 145.540256,54.182935 141.868413,58.4518947 C134.616309,66.8823544 127.439316,75.3743141 120.233991,83.8401528 C119.140279,85.1257012 119.27271,85.2649028 117.837048,85.3885641 C116.88598,85.4708947 115.563312,84.9802173 114.5737,84.9256608 C111.823607,84.774556 109.112057,85.2348141 106.435756,85.8227012 C101.091389,86.9961608 95.4264863,88.9291124 90.7890799,91.898306 C89.5718308,92.677306 88.7874545,93.5971608 87.4670933,93.841177 C86.3183659,94.0534512 84.794416,93.6295641 83.622299,93.5194592 C81.5412806,93.3237173 78.5378542,92.4726366 76.4953793,92.9137173 C73.9027538,93.4738302 72.9174244,96.6109915 75.5604528,98.0003624 C77.570314,99.0564431 81.5706,98.4761608 83.8235816,98.6447899 C86.3971,98.8372253 85.6120649,98.704306 85.2473843,101.164306 C84.7239177,104.69758 85.5985582,108.646475 87.0885766,111.878201 C90.5482655,119.383185 100.122861,127.335201 108.8551,126.603153 C116.142123,125.992451 122.526834,119.413274 125.519389,113.099935 C127.050916,109.868871 127.954546,106.192096 128.250376,102.628403 C128.438811,100.36183 128.333722,97.9580399 127.684083,95.7632173 C127.362888,94.6783705 126.853916,93.5554995 126.308378,92.5695157 C125.866281,91.7710076 123.908799,89.9203866 123.788886,89.1165882 C123.556307,87.5602415 127.973324,83.3874995 128.816339,82.3443141 C132.788953,77.4276205 136.780344,72.5320882 140.721662,67.5889431 C144.603353,62.7201931 148.506456,57.8640076 152.489612,53.0785802 C154.294237,50.9098786 163.318023,42.7148382 160.395307,39.7810237', id: 'Badass-Eyepatch', fill: '#28354B', fillRule: 'evenodd' })))));
+    };
+    Eyepatch.optionValue = 'Eyepatch';
+    return Eyepatch;
+}(React.Component));
+exports.default = Eyepatch;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/HairColor.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/HairColor.d.ts
new file mode 100644
index 000000000..a64f13077
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/HairColor.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export interface Props {
+    maskID: string;
+}
+export default class HairColor extends React.Component<Props> {
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/HairColor.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/HairColor.js
new file mode 100644
index 000000000..10f2deb7f
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/HairColor.js
@@ -0,0 +1,66 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var options_1 = require("../../options");
+function makeColor(name, color) {
+    var ColorComponent = /** @class */ (function (_super) {
+        __extends(ColorComponent, _super);
+        function ColorComponent() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        ColorComponent.prototype.render = function () {
+            return (React.createElement("g", { id: 'Skin/\uD83D\uDC76\uD83C\uDFFD-03-Brown', mask: "url(#" + this.props.maskID + ")", fill: color },
+                React.createElement("g", { transform: 'translate(0.000000, 0.000000) ', id: 'Color' },
+                    React.createElement("rect", { x: '0', y: '0', width: '264', height: '280' }))));
+        };
+        return ColorComponent;
+    }(React.Component));
+    var anyComponent = ColorComponent;
+    anyComponent.displayName = name;
+    anyComponent.optionValue = name;
+    return anyComponent;
+}
+var Auburn = makeColor('Auburn', '#A55728');
+var Black = makeColor('Black', '#2C1B18');
+var Blonde = makeColor('Blonde', '#B58143');
+var BlondeGolden = makeColor('BlondeGolden', '#D6B370');
+var Brown = makeColor('Brown', '#724133');
+var BrownDark = makeColor('BrownDark', '#4A312C');
+var PastelPink = makeColor('PastelPink', '#F59797');
+var Platinum = makeColor('Platinum', '#ECDCBF');
+var Red = makeColor('Red', '#C93305');
+var SilverGray = makeColor('SilverGray', '#E8E1E1');
+var HairColor = /** @class */ (function (_super) {
+    __extends(HairColor, _super);
+    function HairColor() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    HairColor.prototype.render = function () {
+        return (React.createElement(options_1.Selector, { option: options_1.HairColorOption, defaultOption: BrownDark },
+            React.createElement(Auburn, { maskID: this.props.maskID }),
+            React.createElement(Black, { maskID: this.props.maskID }),
+            React.createElement(Blonde, { maskID: this.props.maskID }),
+            React.createElement(BlondeGolden, { maskID: this.props.maskID }),
+            React.createElement(Brown, { maskID: this.props.maskID }),
+            React.createElement(BrownDark, { maskID: this.props.maskID }),
+            React.createElement(PastelPink, { maskID: this.props.maskID }),
+            React.createElement(Platinum, { maskID: this.props.maskID }),
+            React.createElement(Red, { maskID: this.props.maskID }),
+            React.createElement(SilverGray, { maskID: this.props.maskID })));
+    };
+    return HairColor;
+}(React.Component));
+exports.default = HairColor;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Hat.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Hat.d.ts
new file mode 100644
index 000000000..63ef33541
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Hat.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class Hat extends React.Component {
+    static optionValue: string;
+    private filter1;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Hat.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Hat.js
new file mode 100644
index 000000000..8dac3f988
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Hat.js
@@ -0,0 +1,60 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var Hat = /** @class */ (function (_super) {
+    __extends(Hat, _super);
+    function Hat() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    Hat.prototype.render = function () {
+        var _a = this, filter1 = _a.filter1, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path2, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M156,180.610951 C173.530782,172.282984 186.048193,155.114792 187.791419,134.867187 C193.569129,134.002364 198,129.018625 198,123 L198,110 C198,104.054007 193.675427,99.1180731 188,98.1659169 L188,92 C188,84.0546578 186.345324,76.495786 183.361772,69.6491845 C173.434911,53 89.3126235,53.8033992 80.7098777,69.4854816 C77.6811789,76.3752214 76,83.9912805 76,92 L76,98.1659169 C70.3245733,99.1180731 66,104.054007 66,110 L66,123 C66,129.018625 70.4308707,134.002364 76.2085808,134.867187 C77.9518066,155.114792 90.4692178,172.282984 108,180.610951 L108,199 L104,199 L104,199 C64.235498,199 32,231.235498 32,271 L32,280 L232,280 L232,271 C232,231.235498 199.764502,199 160,199 L156,199 L156,180.610951 Z M0,5.68434189e-14 L264,5.68434189e-14 L264,280 L0,280 L0,5.68434189e-14 Z', id: path1 }),
+                React.createElement("filter", { x: '-0.8%', y: '-2.0%', width: '101.5%', height: '108.0%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' })))),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path2 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Accesories/Hat', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement("g", { id: 'Hat', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(1.000000, 0.000000)' },
+                        React.createElement("mask", { id: mask2, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path1 })),
+                        React.createElement("g", { id: 'Mask-Hair' }),
+                        React.createElement("path", { d: 'M123.182388,2 L141.817612,2 L141.817612,2 C160.609055,2 176.866947,15.0804442 180.890118,33.4361631 L190,75 L75,75 L84.1098821,33.4361631 L84.1098821,33.4361631 C88.1330533,15.0804442 104.390945,2 123.182388,2 Z', fill: '#1F333C', mask: "url(#" + mask2 + ")" }),
+                        React.createElement("ellipse", { id: 'Hipster', fill: '#1F333C', mask: "url(#" + mask2 + ")", cx: '132', cy: '87.5', rx: '122', ry: '57.5' }),
+                        React.createElement("ellipse", { id: 'Very', fill: '#15232A', mask: "url(#" + mask2 + ")", cx: '132', cy: '82', rx: '62', ry: '25' })),
+                    React.createElement(facialHair_1.default, null),
+                    this.props.children))));
+    };
+    Hat.optionValue = 'Hat';
+    return Hat;
+}(React.Component));
+exports.default = Hat;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/HatColor.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/HatColor.d.ts
new file mode 100644
index 000000000..d85c5a720
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/HatColor.d.ts
@@ -0,0 +1,8 @@
+import * as React from 'react';
+export interface Props {
+    maskID: string;
+    defaultColor?: string;
+}
+export default class Colors extends React.Component<Props> {
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/HatColor.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/HatColor.js
new file mode 100644
index 000000000..f58cc1ac4
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/HatColor.js
@@ -0,0 +1,75 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var options_1 = require("../../options");
+function makeColor(name, color) {
+    var ColorComponent = /** @class */ (function (_super) {
+        __extends(ColorComponent, _super);
+        function ColorComponent() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        ColorComponent.prototype.render = function () {
+            return (React.createElement("g", { id: 'Color/Palette/Gray-01', mask: "url(#" + this.props.maskID + ")", fillRule: 'evenodd', fill: color },
+                React.createElement("rect", { id: '\uD83D\uDD8DColor', x: '0', y: '0', width: '264', height: '280' })));
+        };
+        return ColorComponent;
+    }(React.Component));
+    var anyComponent = ColorComponent;
+    anyComponent.displayName = name;
+    anyComponent.optionValue = name;
+    return anyComponent;
+}
+var Black = makeColor('Black', '#262E33');
+var Blue01 = makeColor('Blue01', '#65C9FF');
+var Blue02 = makeColor('Blue02', '#5199E4');
+var Blue03 = makeColor('Blue03', '#25557C');
+var Gray01 = makeColor('Gray01', '#E6E6E6');
+var Gray02 = makeColor('Gray02', '#929598');
+var Heather = makeColor('Heather', '#3C4F5C');
+var PastelBlue = makeColor('PastelBlue', '#B1E2FF');
+var PastelGreen = makeColor('PastelGreen', '#A7FFC4');
+var PastelOrange = makeColor('PastelOrange', '#FFDEB5');
+var PastelRed = makeColor('PastelRed', '#FFAFB9');
+var PastelYellow = makeColor('PastelYellow', '#FFFFB1');
+var Pink = makeColor('Pink', '#FF488E');
+var Red = makeColor('Red', '#FF5C5C');
+var White = makeColor('White', '#FFFFFF');
+var Colors = /** @class */ (function (_super) {
+    __extends(Colors, _super);
+    function Colors() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Colors.prototype.render = function () {
+        return (React.createElement(options_1.Selector, { option: options_1.HatColorOption, defaultOption: this.props.defaultColor || Gray01 },
+            React.createElement(Black, { maskID: this.props.maskID }),
+            React.createElement(Blue01, { maskID: this.props.maskID }),
+            React.createElement(Blue02, { maskID: this.props.maskID }),
+            React.createElement(Blue03, { maskID: this.props.maskID }),
+            React.createElement(Gray01, { maskID: this.props.maskID }),
+            React.createElement(Gray02, { maskID: this.props.maskID }),
+            React.createElement(Heather, { maskID: this.props.maskID }),
+            React.createElement(PastelBlue, { maskID: this.props.maskID }),
+            React.createElement(PastelGreen, { maskID: this.props.maskID }),
+            React.createElement(PastelOrange, { maskID: this.props.maskID }),
+            React.createElement(PastelRed, { maskID: this.props.maskID }),
+            React.createElement(PastelYellow, { maskID: this.props.maskID }),
+            React.createElement(Pink, { maskID: this.props.maskID }),
+            React.createElement(Red, { maskID: this.props.maskID }),
+            React.createElement(White, { maskID: this.props.maskID })));
+    };
+    return Colors;
+}(React.Component));
+exports.default = Colors;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Hijab.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Hijab.d.ts
new file mode 100644
index 000000000..485c11eeb
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Hijab.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class Hijab extends React.Component {
+    static optionValue: string;
+    private filter1;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Hijab.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Hijab.js
new file mode 100644
index 000000000..3ce803121
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Hijab.js
@@ -0,0 +1,58 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var HatColor_1 = require("./HatColor");
+var Hijab = /** @class */ (function (_super) {
+    __extends(Hijab, _super);
+    function Hijab() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    Hijab.prototype.render = function () {
+        var _a = this, filter1 = _a.filter1, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M66.0421575,77.0749852 C71.6795257,45.2058307 99.5129755,21 133,21 L133,21 L133,21 C170.555363,21 201,51.444637 201,89 L201,119.751022 C201.875211,129.554379 202.693946,136.422143 203.456205,140.354314 C204.833317,147.458254 209.150269,145.115419 209.150269,155.220201 C209.150269,165.324983 204.822005,168.720206 204.803237,177.705482 C204.784469,186.690758 220.200444,193.836185 220.200444,205.242606 C220.200444,216.649027 213.126079,270.475928 142.577598,270.475928 C127.507235,270.475928 114.670509,266.188589 104.06742,257.613911 C104.750275,264.103957 105.394468,271.565987 106,280 L59,280 C59.9324304,256.228591 51.7156549,242.936205 51.7156549,216.44564 C51.7156549,189.955074 65.3525844,151.427541 65,142 C65.019981,141.417741 65.0406721,140.728417 65.0620734,139.932027 C65.0208303,138.959828 65,137.982347 65,137 L65,89 L65,89 C65,85.0240875 65.3412247,81.1278723 65.9959868,77.3390417 C65.9973236,77.2261704 65.9986613,77.1131564 66,77 C66.0140661,77.0249783 66.0281186,77.0499734 66.0421575,77.0749852 Z M132.5,53 L132.5,53 C102.400481,53 78,77.4004811 78,107.5 L78,107.5 L78,130.5 C78,160.599519 102.400481,185 132.5,185 L133.5,185 C163.599519,185 188,160.599519 188,130.5 L188,107.5 C188,77.4004811 163.599519,53 133.5,53 L133.5,53 L132.5,53 Z', id: path2 }),
+                React.createElement("filter", { x: '-0.8%', y: '-2.0%', width: '101.5%', height: '108.0%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' })))),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Accesories/Hijab', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement("mask", { id: mask2, fill: 'white' },
+                        React.createElement("use", { xlinkHref: '#' + path2 })),
+                    React.createElement("use", { id: 'Hijab-Mask', stroke: 'none', fill: '#3B6BAD', fillRule: 'evenodd', xlinkHref: '#' + path2 }),
+                    React.createElement(HatColor_1.default, { maskID: mask2, defaultColor: 'Blue03' }),
+                    React.createElement("path", { d: 'M72.0744416,104.959767 C71.3690172,101.246903 71,97.4161983 71,93.5 C71,59.5344879 98.7583455,32 133,32 C167.241654,32 195,59.5344879 195,93.5 C195,97.4161983 194.630983,101.246903 193.925558,104.959767 C192.341315,72.6827942 165.669927,47 133,47 C100.330073,47 73.6586845,72.6827942 72.0744428,104.959774 Z', id: 'Band', stroke: 'none', fillOpacity: '0.5', fill: '#FFFFFF', fillRule: 'evenodd', mask: "url(#" + mask2 + ")" }),
+                    React.createElement("path", { d: 'M187.929085,104.69543 C188.631457,108.187732 189,111.800827 189,115.5 L189,138.5 C189,168.599519 164.599519,193 134.5,193 L131.5,193 C101.400481,193 77,168.599519 77,138.5 L77,115.5 L77,115.5 C77,111.800827 77.3685433,108.187732 78.0709154,104.69543 C78.0238287,105.624341 78,106.559388 78,107.5 L78,107.5 L78,130.5 C78,160.599519 102.400481,185 132.5,185 L133.5,185 C163.599519,185 188,160.599519 188,130.5 L188,130.5 L188,107.5 C188,106.559388 187.976171,105.624341 187.929085,104.69543 Z M114.16682,206.995462 C120.651206,211.981028 135.663493,213.708321 152.404574,210.756416 C169.145655,207.804512 182.661822,201.046883 187.049987,194.144193 C187.118291,194.396526 187.175421,194.652296 187.221114,194.911435 C188.930607,204.606451 173.985409,215.345413 153.84008,218.897578 C133.694752,222.449742 115.977919,217.469978 114.268426,207.774963 C114.222732,207.515823 114.188938,207.255938 114.166824,206.995464 Z M126.034638,235.921439 C134.227056,241.574977 150.421729,241.843835 167.103682,235.772101 C183.785635,229.700366 196.018656,219.084674 198.660388,209.487828 C198.803116,209.80837 198.935124,210.134883 199.056117,210.46731 C203.582768,222.904181 190.979008,238.909268 170.904831,246.215671 C150.830654,253.522074 130.887742,249.363007 126.361091,236.926135 C126.240098,236.593709 126.131343,236.258733 126.034643,235.921442 Z', id: 'Shadows', stroke: 'none', fillOpacity: '0.16', fill: '#000000', fillRule: 'evenodd', opacity: '0.899999976', mask: "url(#" + mask2 + ")" }),
+                    this.props.children))));
+    };
+    Hijab.optionValue = 'Hijab';
+    return Hijab;
+}(React.Component));
+exports.default = Hijab;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBigHair.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBigHair.d.ts
new file mode 100644
index 000000000..a2d481a25
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBigHair.d.ts
@@ -0,0 +1,11 @@
+import * as React from 'react';
+export default class LongHairBigHair extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private mask3;
+    private path1;
+    private path2;
+    private path3;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBigHair.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBigHair.js
new file mode 100644
index 000000000..af4b46833
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBigHair.js
@@ -0,0 +1,61 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var LongHairBigHair = /** @class */ (function (_super) {
+    __extends(LongHairBigHair, _super);
+    function LongHairBigHair() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.mask3 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.path3 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    LongHairBigHair.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, mask3 = _a.mask3, path1 = _a.path1, path2 = _a.path2, path3 = _a.path3;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M222.384814,182.806274 C217.011239,188.518122 211.648364,192.127879 211.831204,198 C212.148076,209.888877 255.439069,245.051165 216.999964,267.00001 L16.0053198,267 C-22.4337677,245.051165 20.8572256,209.888877 21.1740982,198 C21.3569373,192.127879 15.9940628,188.518122 10.6204878,182.806274 C5.24691269,177.094426 -0.137362978,169.280486 0.00267373922,155 C0.944497502,125.971596 31.3716806,128.588232 31.2026676,109 C31.3716806,89.9992744 19.8139454,82.1607482 31.2026676,46 C42.8395963,9.53932757 72.9165934,0.768171773 116.002651,0.0159928999 L116.002651,0 C116.16951,0.002426813 116.336177,0.0049705256 116.502651,0.0076322645 C116.669125,0.0049705256 116.835791,0.002426813 117.002651,0 L117.002651,0.0159928999 C160.088708,0.768171773 190.165705,9.53932757 201.802634,46 C213.191356,82.1607482 201.633621,89.9992744 201.802634,109 C201.633621,128.588232 232.060804,125.971596 233.002628,155 C233.142665,169.280486 227.758389,177.094426 222.384814,182.806274 Z M182.884023,95.3249541 C161.364085,83.7373848 142.890027,67.1442914 130.845581,48.302359 C112.763849,73.9237118 76.5299076,78.5347548 51.2240944,94.679971 C51.0770557,95.4306015 51,96.2063021 51,97 L51,110 C51,116.018625 55.4308707,121.002364 61.2085808,121.867187 C62.9518066,142.114792 75.4692178,159.282984 93,167.610951 L93,186 L89,186 L89,186 C49.235498,186 17,218.235498 17,258 L17,267 L217,267 L217,258 C217,218.235498 184.764502,186 145,186 L141,186 L141,167.610951 C158.530782,159.282984 171.048193,142.114792 172.791419,121.867187 C178.569129,121.002364 183,116.018625 183,110 L183,97 C183,96.4315537 182.960475,95.8723389 182.884023,95.3249541 Z', id: path2 }),
+                React.createElement("path", { d: 'M222.384814,182.806274 C217.011239,188.518122 211.648364,192.127879 211.831204,198 C212.148076,209.888877 255.439069,245.051165 216.999964,267.00001 L16.0053198,267 C-22.4337677,245.051165 20.8572256,209.888877 21.1740982,198 C21.3569373,192.127879 15.9940628,188.518122 10.6204878,182.806274 C5.24691269,177.094426 -0.137362978,169.280486 0.00267373922,155 C0.944497502,125.971596 31.3716806,128.588232 31.2026676,109 C31.3716806,89.9992744 19.8139454,82.1607482 31.2026676,46 C42.8395963,9.53932757 72.9165934,0.768171773 116.002651,0.0159928999 L116.002651,0 C116.16951,0.002426813 116.336177,0.0049705256 116.502651,0.0076322645 C116.669125,0.0049705256 116.835791,0.002426813 117.002651,0 L117.002651,0.0159928999 C160.088708,0.768171773 190.165705,9.53932757 201.802634,46 C213.191356,82.1607482 201.633621,89.9992744 201.802634,109 C201.633621,128.588232 232.060804,125.971596 233.002628,155 C233.142665,169.280486 227.758389,177.094426 222.384814,182.806274 Z M93,186 L89,186 L89,186 C49.235498,186 17,218.235498 17,258 L17,267 L217,267 L217,258 C217,218.235498 184.764502,186 145,186 L141,186 L141,140 L93,140 L93,186 Z', id: path3 })),
+            React.createElement("mask", { id: mask2, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Long-Hair/Big-Hair', mask: "url(#" + mask2 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement("g", { id: 'Hair', strokeWidth: '1', fill: 'none', fillRule: 'evenodd', transform: 'translate(16.000000, 13.000000)' },
+                        React.createElement("mask", { id: mask3, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path2 })),
+                        React.createElement("use", { fill: '#314756', xlinkHref: '#' + path2 }),
+                        React.createElement(HairColor_1.default, { maskID: mask3 })),
+                    React.createElement("g", { id: 'Shadow', strokeWidth: '1', fill: 'none', fillRule: 'evenodd', transform: 'translate(16.000000, 13.000000)' },
+                        React.createElement("mask", { id: mask1, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path3 })),
+                        React.createElement("g", { id: 'Shape' }),
+                        React.createElement("path", { d: 'M30.0988695,115.056827 C27.7250732,118.08281 24.5296181,122.528485 24.3618393,122.19381 C26.2345006,119.810609 27.3747977,117.011661 27.3409475,113.436088 C27.517612,95.334874 15.4366324,87.8674306 27.3409475,53.4185647 C28.0096512,51.5090274 29.1070085,49.7044671 30.585889,48.0048838 C20.2433352,82.4586863 31.3685109,90.3556196 31.2026676,109 C31.2224682,111.294844 30.8223327,113.284923 30.0988695,115.056827 Z M202.419413,48.0048838 C203.898293,49.7044671 204.995651,51.5090274 205.664354,53.4185647 C215.822041,82.8130155 208.516445,92.5627534 206.263744,106.036479 C205.964379,106.841192 206.195125,107.789747 205.880216,108.603009 C175.207016,98.1454461 147.589972,78.5596292 131.494917,55.6119279 C108.710969,85.0357527 58.3544031,85.3732378 33.6737341,110.936101 C34.0607045,110.391798 34.4280855,109.884956 34.7584999,109.446288 C57.2940449,79.527377 108.24688,80.3241416 130.845581,48.302359 C146.243536,72.3904102 172.664446,92.9495135 202.009146,103.926748 C202.310417,103.073073 202.089664,102.077381 202.376063,101.232679 C204.483829,87.4002546 211.215481,77.3069293 202.419413,48.0048838 Z', id: 'Shadow-Mask', fillOpacity: '0.16', fill: '#000000', mask: "url(#" + mask1 + ")" })),
+                    React.createElement("path", { d: 'M50.7584999,122.446288 C73.2940449,92.527377 124.24688,93.3241416 146.845581,61.302359 C162.243536,85.3904102 188.664446,105.949514 218.009146,116.926748 C218.310417,116.073073 218.089664,115.077381 218.376063,114.232679 C220.531197,100.089398 227.520377,89.8551619 217.802634,59 C206.165705,22.5393276 176.088708,13.7681718 133.002651,13.0159929 C132.336177,13.0049705 132.16951,13.0024268 132.002651,13 C88.9165934,13.7681718 58.8395963,22.5393276 47.2026676,59 C35.8139454,95.1607482 47.3716806,102.999274 47.2026676,122 C47.2350518,125.753256 46.1441426,128.691293 44.3525888,131.192923 C44.5361111,131.59459 48.5061717,125.436551 50.7584999,122.446288 Z', id: 'Light', fillOpacity: '0.1', fill: '#FFFFFF', fillRule: 'evenodd' }),
+                    React.createElement(facialHair_1.default, null),
+                    this.props.children))));
+    };
+    LongHairBigHair.optionValue = 'LongHairBigHair';
+    return LongHairBigHair;
+}(React.Component));
+exports.default = LongHairBigHair;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBob.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBob.d.ts
new file mode 100644
index 000000000..2afe6e92e
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBob.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+export default class LongHairBob extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBob.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBob.js
new file mode 100644
index 000000000..8c19b2cc2
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBob.js
@@ -0,0 +1,52 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var LongHairBob = /** @class */ (function (_super) {
+    __extends(LongHairBob, _super);
+    function LongHairBob() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    LongHairBob.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M38,79.3595521 L38,111 C38,133.339168 51.0804213,152.623239 70,161.610951 L70,174.74565 C50.3625813,177.434228 34.6409914,182.163507 23.3845374,181.000327 C9.16164761,179.530612 1.49623627,150.795665 1,126 C0.382878875,95.1640258 29.3189583,30.7950013 40,18 C47.9231015,8.50878211 69.6952966,0.550643437 94.0001685,1 C118.30504,1.44935656 140.861928,6.81215989 149.000169,17 C161.324059,32.4276364 186.868727,91.0786423 187.000169,126 C187.093514,150.800049 177.46255,175.65995 164.000169,177 C152.920532,178.102871 137.475571,175.511343 118,173.997342 L118,161.610951 C136.919579,152.623239 150,133.339168 150,111 L150,82.9882378 C140.478735,78.1305678 131.863294,72.248172 124.153679,65.3410505 C127.362309,70.6368571 130.848786,75.1475352 134.61311,78.8730846 C107.596314,71.2928169 86.1055278,58.4501118 70.1407506,40.3449693 C62.1597317,56.8095313 51.4461487,69.8143919 38.0000014,79.3595511 Z', id: path2 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Long-Hair/Bob', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement("g", { id: 'Hair', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(39.000000, 19.000000)' },
+                        React.createElement("mask", { id: mask2, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path2 })),
+                        React.createElement("use", { id: 'Combined-Shape', fill: '#E6E6E6', xlinkHref: '#' + path2 }),
+                        React.createElement(HairColor_1.default, { maskID: mask2 })),
+                    React.createElement(facialHair_1.default, null),
+                    this.props.children))));
+    };
+    LongHairBob.optionValue = 'LongHairBob';
+    return LongHairBob;
+}(React.Component));
+exports.default = LongHairBob;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBun.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBun.d.ts
new file mode 100644
index 000000000..577670163
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBun.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+export default class LongHairBun extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBun.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBun.js
new file mode 100644
index 000000000..3a38090d1
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairBun.js
@@ -0,0 +1,51 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var LongHairBun = /** @class */ (function (_super) {
+    __extends(LongHairBun, _super);
+    function LongHairBun() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    LongHairBun.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path2, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M114.939716,28.3372418 C113.953527,28.5587334 112.985531,28.7906134 112.036894,29.0299707 C96.9448338,32.8379559 88.0168242,43.6513048 80.3566792,59.6480618 C76.5956048,67.5028569 74.3660182,76.7914798 74.0230569,85.4813651 C73.8884429,88.8932666 74.3484305,92.415154 75.267729,95.7003546 C75.6049405,96.9061873 77.4232441,101.086987 77.9224658,97.70885 C78.0885348,96.584253 77.4804043,95.0327505 77.4215529,93.8376154 C77.3444374,92.2693977 77.4273028,90.6807875 77.5341822,89.1149098 C77.7340739,86.1874141 78.2559568,83.3154127 79.1847257,80.524647 C80.5119249,76.5367405 82.2013644,72.212859 84.7874413,68.8480942 C91.1883705,60.5205939 95.7648164,43.2055199 133,41.6707324 C170.235184,40.1359449 181.748751,67.461069 185.182761,73.3006826 C189.2479,80.2147477 187.37751,88.7073939 188.619138,96.2008069 C189.091302,99.05041 190.164155,98.986558 190.751315,96.4378281 C191.748406,92.1082634 192.219217,87.6102098 191.901961,83.1592929 C191.183568,73.1114668 187.496636,46.7057251 167.308863,35.006118 C161.866498,31.8520537 156.438352,29.6874962 151.116597,28.2827668 C154.176091,25.3110645 156,21.5675963 156,17.5 C156,7.83501688 145.702549,0 133,0 C120.297451,0 110,7.83501688 110,17.5 C110,21.5924906 111.846303,25.3568736 114.939716,28.3372418 Z', id: path1 })),
+            React.createElement("mask", { id: mask2, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path2 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Long-Hair/Bun', mask: "url(#" + mask2 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement(facialHair_1.default, null),
+                    React.createElement("mask", { id: mask1, fill: 'white' },
+                        React.createElement("use", { xlinkHref: '#' + path1 })),
+                    React.createElement("use", { id: 'Short-Hair', stroke: 'none', fill: '#28354B', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+                    React.createElement(HairColor_1.default, { maskID: mask1 }),
+                    this.props.children))));
+    };
+    LongHairBun.optionValue = 'LongHairBun';
+    return LongHairBun;
+}(React.Component));
+exports.default = LongHairBun;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairCurly.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairCurly.d.ts
new file mode 100644
index 000000000..7e02ceb64
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairCurly.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+export default class LongHairCurly extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairCurly.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairCurly.js
new file mode 100644
index 000000000..cd4e18e9e
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairCurly.js
@@ -0,0 +1,53 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var LongHairCurly = /** @class */ (function (_super) {
+    __extends(LongHairCurly, _super);
+    function LongHairCurly() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    LongHairCurly.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M48.7246602,89.2187346 C44.7420117,91.1711421 42,95.2653555 42,100 L42,113 C42,119.018625 46.4308707,124.002364 52.2085808,124.867187 C53.9518066,145.114792 66.4692178,162.282984 84,170.610951 L84,189 L80,189 L80,189 C78.4137385,189 76.8394581,189.051297 75.2787271,189.152323 C70.3620966,186.639548 65.7724391,183.578174 61.590479,180.048925 C57.2814481,181.318646 52.7202934,182 48,182 C21.490332,182 0,160.509668 0,134 C0,119.590902 6.34904132,106.664702 16.4021743,97.866349 C11.1175746,90.6060809 8,81.6671147 8,72 C8,50.160623 23.9112243,32.0375116 44.7738169,28.5905219 C51.0188047,11.8901624 67.1208542,0 86,0 C94.0143172,0 101.528186,2.14267429 108,5.88641659 C114.471814,2.14267429 121.985683,0 130,0 C148.879146,0 164.981195,11.8901624 171.226183,28.5905219 C192.088776,32.0375116 208,50.160623 208,72 C208,81.6671147 204.882425,90.6060809 199.597826,97.866349 C209.650959,106.664702 216,119.590902 216,134 C216,160.509668 194.509668,182 168,182 C163.279707,182 158.718552,181.318646 154.409521,180.048925 C150.227561,183.578174 145.637903,186.639548 140.721273,189.152323 C139.160542,189.051297 137.586262,189 136,189 L136,189 L132,189 L132,170.610951 C149.530782,162.282984 162.048193,145.114792 163.791419,124.867187 C169.569129,124.002364 174,119.018625 174,113 L174,100 C174,95.778427 171.820067,92.0660046 168.524466,89.9269981 C167.450514,89.5343912 166.370126,89.0424011 165.289302,88.4564081 C164.868503,88.3367332 164.43828,88.2394463 164,88.1659169 L164,87.7130302 C155.319369,82.4100235 146.764694,71.1747746 141.449951,56.7992877 C131.312295,58.8351061 119.547256,60 107,60 C95.038684,60 83.7882341,58.9413637 73.9808476,57.0787685 C68.7546917,71.0641476 60.4637821,82.0431875 52,87.4230168 L52,88.1659169 C50.9777341,88.3374206 49.9992949,88.6381729 49.0820602,89.050796 C48.9628927,89.1079465 48.8437566,89.1639284 48.7246602,89.2187346 Z', id: path2 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Long-Hair/Curly', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement("path", { d: 'M105.984735,27.7643628 C114.013215,26.6267967 122.796163,26 132,26 C142.358003,26 152.182939,26.7938545 160.999342,28.2161842 C183.451688,38.7497687 199,61.559133 199,88 L199,105.044138 C187.461887,104.672508 173.831239,90.7644306 166.449951,70.7992877 C156.312295,72.8351061 144.547256,74 132,74 C120.038684,74 108.788234,72.9413637 98.9808476,71.0787685 C91.6758772,90.6271291 78.3831001,104.301811 67,105.021902 L67,88 L67,88 C67,61.1745453 83.0039076,38.0870034 105.984735,27.7643628 Z', id: 'Shadow', fillOpacity: '0.16', fill: '#000000', fillRule: 'evenodd' }),
+                    React.createElement("g", { id: 'Hair', strokeWidth: '1', fill: 'none', fillRule: 'evenodd', transform: 'translate(25.000000, 10.000000)' },
+                        React.createElement("mask", { id: mask2, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path2 })),
+                        React.createElement("use", { id: 'Curly!', fill: '#314756', xlinkHref: '#' + path2 }),
+                        React.createElement(HairColor_1.default, { maskID: mask2 })),
+                    React.createElement(facialHair_1.default, null),
+                    this.props.children))));
+    };
+    LongHairCurly.optionValue = 'LongHairCurly';
+    return LongHairCurly;
+}(React.Component));
+exports.default = LongHairCurly;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairCurvy.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairCurvy.d.ts
new file mode 100644
index 000000000..099b45078
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairCurvy.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+export default class LongHairCurvy extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairCurvy.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairCurvy.js
new file mode 100644
index 000000000..87c26ec7b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairCurvy.js
@@ -0,0 +1,55 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var LongHairCurvy = /** @class */ (function (_super) {
+    __extends(LongHairCurvy, _super);
+    function LongHairCurvy() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    LongHairCurvy.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M162.831093,71.6181521 C162.943003,73.0640672 163,74.5253775 163,76 L163,114 C163,136.339168 149.919579,155.623239 131,164.610951 L131,183 L135,183 C136.524404,183 137.037743,183.047374 138.538625,183.140731 C123.625568,210.496321 119.823733,233.574048 137.47212,247.543277 C139.169858,248.745686 140.396085,249.328761 140.607243,249.428275 C142.980035,250.546232 145.444343,251.76781 148.074296,252.382591 C152.696796,253.463231 158.007057,252.010459 162.630756,251.429524 C164.742591,251.164137 166.847633,251.000636 168.977452,250.993519 C171.542066,250.985014 174.188404,251.078221 176.119408,252.691023 C178.003455,254.264772 177.763079,259.889444 172.244213,262.523872 C176.3432,264.37915 181.25603,260.071171 182.931671,257.34666 C184.398107,254.962171 185.526058,252.378599 186.146081,249.741914 C186.917963,246.458686 186.967717,243.016815 186.363678,239.728032 C185.106048,232.88022 182.187563,226.295538 180.201011,219.605673 C179.468692,217.139607 178.51478,214.440611 178.099366,211.916746 C177.986471,211.23167 177.851996,208.701383 177.957698,208.171998 C178.036425,207.778517 178.016643,207.37549 179.372782,206.996069 C183.288539,205.899634 187.379733,204.063449 190.225486,201.476579 C193.590156,198.418295 195.343925,194.445304 196.758409,190.497133 C198.998525,184.244662 200.281132,177.550111 200.870584,171.057073 C200.99307,169.708269 201.062205,168.361722 201.086383,167.009968 C201.10077,166.193153 201.000862,165.263344 201.094375,164.445141 C201.247433,163.105189 201.039826,163.457881 202.341615,162.571291 C206.599454,159.671476 209.921164,155.448546 212.051783,151.200622 C215.39827,144.528634 215.834064,137.49302 213.117591,130.733555 C210.864687,125.12728 207.291411,119.498616 201.725588,115.887863 C199.588776,114.501568 197.334273,113.244582 195.115337,111.95809 C193.906862,111.257566 191.067703,110.342511 190.209501,109.441341 C189.609259,108.810939 190.56477,105.649382 190.685858,104.583322 C191.213967,99.9353218 190.606132,95.4261763 189.520542,90.8868298 C187.127368,80.8793698 177.487944,64.7382958 173.617944,55.2249863 C170.293437,47.0528435 165.481911,-0.0750473139 108.58669,0.198941193 C51.691468,0.4729297 41.4185991,50.4377258 33.7159879,59.7736698 C25.3512665,69.9121239 16.9074766,89.1763214 22.602684,107.035643 C17.099033,113.95809 4.54481227,124.04369 1.3853513,134.125611 C-0.596804833,140.450807 -0.511883829,147.495621 2.0289526,153.633016 C3.46621561,157.104393 5.52490056,160.250502 7.94045353,163.272162 C10.0566849,165.919435 12.4084972,168.423513 14.4577909,171.110359 C15.6946403,172.732013 16.0263318,173.129312 15.5599656,175.128304 C14.6406208,179.068318 12.7411877,182.853334 11.0939201,186.603116 C8.54189405,192.412639 6.39748885,197.82226 6.0799842,204.016065 C5.77766543,209.912373 7.40435223,226.688671 24.3409972,236.576369 C26.3249517,237.73442 28.2831301,238.743202 30.3833764,239.685161 C29.2931905,236.290327 30.5294405,224.161856 32.7263968,219.653578 C33.2860762,221.204589 34.2369916,222.697108 35.2618383,224.05216 C36.8611506,226.167444 40.636039,231.460774 45.4085994,231.706547 C43.4722007,228.722725 41.3891385,226.708805 40.7853002,223.10864 C44.7616013,225.068753 50.4191385,226.855644 55.0466338,226.691448 C58.4512667,226.570818 63.4709972,224.871405 66.0000446,222.74779 C57.6284322,224.074724 49.679027,221.3155 46.4820009,215.419366 C45.8146217,214.188415 45.3084926,212.898625 45.0141664,211.558847 C44.5967546,209.659309 43.9381673,206.615432 44.8227444,204.862039 C45.0375932,204.436124 45.3893685,204.001198 45.806628,203.572743 C45.7407358,203.49425 45.6753213,203.415537 45.6103845,203.336606 C51.303506,198.550494 58.4494475,190.932516 62.2752482,185.367908 C62.3459243,185.245492 62.416066,185.122857 62.4856702,185 L62.5253504,185 C62.5536953,184.957813 62.5818364,184.915755 62.6097716,184.873828 C67.874859,183.648086 73.3617452,183 79,183 L83,183 L83,164.610951 C64.0804213,155.623239 51,136.339168 51,114 L51,76 L51,76 C51,73.537425 51.1589523,71.1119753 51.4671565,68.733351 C55.4088487,67.4702772 59.365485,66.2776957 63.3986046,65.2045441 C67.8552588,64.0189378 77.7980098,62.0907786 81.6887904,61.1941723 L84.4252449,58.215348 L85.4876566,60.1702128 C87.6456492,60.0042337 99.5663601,58.212708 99.5663601,58.212708 L100.896323,54.9898699 C102.612526,56.7530625 103.834989,57.668872 103.834989,57.668872 C106.391211,57.460454 117.488488,57.2113208 120.119841,57.2427023 C120.119841,57.2427023 127.460212,57.5012269 129.240756,57.5714137 L130.907605,56.9328981 L131.456495,58.0098503 C132.910143,58.601117 141.699367,61.6008734 143.434153,62.138079 L145.980784,61.2323702 C147.100342,63.9256202 149.920119,63.586016 152.257345,65.7132858 C154.760315,67.9915694 159.482831,69.7372554 162.831093,71.6181521 Z', id: path2 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Long-Hair/Curvy', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement("path", { d: 'M100.899906,42.4648024 C91.1016204,48.4721303 82.3855283,56.3273858 76.5871222,65.36024 C73.8252914,69.662826 71.5532049,74.1995784 69.4361743,78.7575668 C68.3739624,81.0447336 67.4048638,83.3600237 66.475928,85.6893613 C65.8894735,87.1594817 64.9889112,88.7449062 65.8359233,90.2878445 C66.3526427,89.9857996 66.5492598,90.0943892 66.224362,90.6353417 C68.9162579,91.3693254 72.6583769,89.3003017 74.9906073,88.5362205 C79.7539763,86.9753339 84.5203425,85.5025753 89.3986046,84.2045441 C93.8552588,83.0189378 103.79801,81.0907786 107.68879,80.1941723 L110.425245,77.215348 L111.487657,79.1702128 C113.645649,79.0042337 125.56636,77.212708 125.56636,77.212708 L126.896323,73.9898699 C128.612526,75.7530625 129.834989,76.668872 129.834989,76.668872 C132.391211,76.460454 143.488488,76.2113208 146.119841,76.2427023 C146.119841,76.2427023 153.460212,76.5012269 155.240756,76.5714137 L156.907605,75.9328981 L157.456495,77.0098503 C158.910143,77.601117 167.699367,80.6008734 169.434153,81.138079 L171.980784,80.2323702 C173.100342,82.9256202 175.920119,82.586016 178.257345,84.7132858 C181.34867,87.5271086 187.825645,89.5285179 190.917768,91.9756241 C192.024938,92.8519441 193.059576,93.7675012 194.100208,94.7015404 C195.255933,95.7385867 195.085291,95.890424 195.460742,97.0802141 C195.573237,97.4361731 196.715775,99.2788807 197.202722,99.4296139 C198.935909,99.9660566 187.048767,68.9435732 183.785603,64.9771662 C180.417736,60.8830307 158.574915,33.3231248 129.612057,34.2254634', id: 'Top-Shadow', fillOpacity: '0.16', fill: '#000000', fillRule: 'evenodd' }),
+                    React.createElement("g", { id: 'Hair', strokeWidth: '1', fill: 'none', fillRule: 'evenodd', transform: 'translate(26.000000, 16.000000)' },
+                        React.createElement("mask", { id: mask2, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path2 })),
+                        React.createElement("use", { id: 'Hair-Mask', fill: '#361A0A', xlinkHref: '#' + path2 }),
+                        React.createElement(HairColor_1.default, { maskID: mask2 }),
+                        React.createElement("path", { d: 'M62.6794556,184.462132 C69.755442,174.755405 62.148959,147.786913 56.1278159,137.800593 C72.9649824,130.137708 106.213574,131.553467 155.87359,142.047871 C151.079203,150.900348 149.123448,158.803527 150.006324,165.757409 C145.469118,171.332534 141.720304,177.127222 138.759883,183.141474 L103.888915,191.746789 C81.8528509,194.400378 68.1163643,191.97216 62.6794556,184.462132 Z', id: 'Shadow', fillOpacity: '0.24', fill: '#000000', mask: "url(#" + mask2 + ")" })),
+                    React.createElement("path", { d: 'M79.0404573,170.094305 C78.9812573,169.892618 78.8354573,169.667152 78.6348573,169.428842 C78.7708573,169.650142 78.9074573,169.871269 79.0404573,170.094305 Z M56.409572,120.375261 C57.2661752,126.5406 58.7356083,132.465374 60.8662263,138.377476 C62.9277086,144.09848 65.285915,149.836145 68.678559,155.067858 C71.8402179,159.943234 75.6031176,164.4923 78.6348973,169.428772 C77.8378388,168.48126 76.1633964,167.329804 75.5207941,166.65115 C74.4643769,165.535276 73.4750971,164.385382 72.5369698,163.193485 C70.6143583,160.749982 68.9003527,158.193833 67.243494,155.609567 C63.9913192,150.536843 61.5529875,145.034363 59.4397533,139.530668 C55.2902133,128.722708 51.1268862,115.61687 54.7738936,104.200899 C54.4921557,104.935095 55.2326668,106.688314 55.3491585,107.497319 C55.5525692,108.91069 55.7349995,110.333608 55.8267142,111.757219 C56.0123415,114.639678 56.0109428,117.505994 56.409572,120.375261 Z M68.8553146,165.041212 C67.4967783,163.309515 64.9739252,161.944396 63.4129772,160.279177 C61.9976938,158.769648 60.9019131,157.07822 59.9070386,155.339754 C57.6517365,151.39922 56.1697151,147.374505 55.6897616,142.969154 C55.7992598,143.49177 56.6083072,144.395543 56.8630702,144.824778 C57.4766993,145.858902 58.0839345,146.89424 58.6508072,147.948671 C59.7481863,149.989667 60.6639345,152.099744 61.7731027,154.135533 C63.8106073,157.875421 66.402796,161.495374 68.8553146,165.041212 Z M73.5320242,183.498629 C74.6465874,185.460651 75.5723262,187.464851 76.1569823,189.60079 C76.4654954,190.727599 76.7138643,191.869508 76.9272658,193.013501 C76.9962017,193.382508 77.0093894,194.709963 77.1846264,195.283955 C74.9700864,190.992812 73.2798587,186.448779 70.6421125,182.34214 C68.0381348,178.288092 64.6948448,174.560527 61.1958996,171.061031 C57.5013364,167.36575 53.7855929,163.879099 51.8038364,159.214262 C50.0788411,155.153619 49.4126608,150.996124 49.8138875,146.658464 C49.8160855,148.56911 51.5706533,151.280256 52.1766896,153.126681 C53.0063178,155.654018 53.6655046,158.231689 54.9143429,160.634229 C57.039566,164.722991 60.873,167.876911 64.0792175,171.321558 C67.631513,175.137643 71.0245567,179.084252 73.5320242,183.498629 Z M59.2286696,174.179456 C60.2874847,175.196917 61.2164205,176.28259 62.0352588,177.454354 C62.9328239,178.738937 63.5914112,180.09017 64.1800637,181.504062 C64.6869921,182.721301 64.9105841,184.986375 65.7074428,186.0021 C63.1288415,182.856337 60.4739112,179.884838 58.6955655,176.312444 C58.0893295,175.089825 57.1480051,173.289222 56.4530516,171.817184 C56.6844363,172.409922 58.7059559,173.677148 59.2286696,174.179456 Z M48.9033745,180.528033 C51.7405353,184.777866 55.450684,188.609052 57.877027,193.056233 C60.7067946,198.242644 61.9518364,203.862978 62.202803,209.595957 C62.3216924,212.307277 62.3152983,215.0606 61.9498383,217.764455 C61.7540204,219.211673 61.4399126,220.650211 61.0810465,222.075732 C60.944973,222.616747 60.2406283,224.002173 60.1037556,224.846586 C59.8140251,214.305575 61.5584024,203.763696 56.0767017,193.942823 C53.4811162,189.292219 49.4912277,185.327212 46.398105,180.924811 C43.6164926,176.966226 40.8998197,173.083838 38.6846803,168.851361 C40.0408188,170.567263 42.485145,171.915893 44.0009349,173.619818 C45.8995688,175.753674 47.3488206,178.199606 48.9033745,180.528033 Z M60.1036574,224.846603 C60.0710574,225.050581 60.0700574,225.224111 60.1172574,225.346603 C60.1116574,225.180112 60.1082574,225.01327 60.1036574,224.846603 Z M50.5604331,202.493815 C50.5610325,202.989874 51.376474,204.011501 51.5992667,204.528562 C52.1207816,205.73799 52.5455864,207.007473 52.7573894,208.289626 C53.1752007,210.818004 52.6269108,213.429521 51.6899823,215.850286 C49.7909489,220.757251 46.8161162,225.102895 43.0767946,229.15 C44.4121524,227.402335 44.9438578,224.56136 45.8833838,222.612182 C46.8478866,220.611106 47.8829238,218.6411 48.7335325,216.600624 C50.652947,211.995842 50.4835046,207.289696 50.5604331,202.493815 Z M41.9174331,221.200893 C42.3180604,220.652936 42.1102537,218.018161 42.3222565,217.328919 C42.714092,216.055618 43.3920613,214.827097 44.170737,213.693866 C43.7551236,214.392828 44.3691524,216.160106 44.1663411,217.067177 C43.8338504,218.55553 42.9962296,219.998582 41.9174331,221.200893 Z M99.6077106,42.748374 C99.5269106,42.804974 99.4471106,42.908174 99.3681106,43.044574 C99.4481106,42.945974 99.5267106,42.846574 99.6077106,42.748374 Z M84.8469387,64.3317143 C86.2672175,63.085837 87.0237138,60.1410677 88.0032026,58.5522183 C89.1283559,56.7269681 90.4213532,54.9730547 91.6476125,53.1960567 C94.0795502,49.6719145 96.3744154,46.2123399 99.3680307,43.0054816 C98.7464089,43.9398028 98.1949219,46.7736616 97.8536394,47.5189663 C96.9620688,49.4667561 95.8988578,51.3334892 94.6328355,53.1235049 C91.7722965,57.1680066 88.7029517,60.9266404 84.8469387,64.3317143 Z M84.3117165,54.1218036 C85.0620186,52.7952168 86.2055548,51.6739619 87.4917584,50.7082248 C86.9188913,51.2107066 86.6607314,53.2831189 86.2670976,53.9831221 C85.472237,55.3952784 84.3143141,56.6130375 83.0714703,57.7545999 C83.7352528,57.1726235 83.842553,54.9516363 84.3117165,54.1218036 Z M203.505599,152.127968 C203.498805,152.179518 203.485417,152.282271 203.464637,152.438483 C203.462638,150.913159 202.784469,149.237352 202.704144,147.668984 C202.592048,145.478545 202.906556,143.353715 203.787137,141.277137 C205.526519,137.175704 208.790083,134.069516 212.950612,131.638511 C211.805877,132.313173 210.683921,134.851617 209.949604,135.906916 C208.84663,137.493162 207.668126,139.094161 206.735993,140.757819 C204.793001,144.225725 204.229725,148.375062 203.505599,152.127968 Z M201.998401,130.481881 C201.761221,131.706583 201.448912,132.921738 201.009121,134.107908 C200.534762,135.386937 199.915938,136.630558 199.22578,137.835993 C198.79578,138.586852 197.246621,140.162684 197.24762,140.993211 C197.165296,136.095098 198.975812,131.657983 202.419809,127.7355 C202.04236,128.392806 202.137271,129.766083 201.998401,130.481881 Z M201.196906,165.719988 C204.852905,165.202752 208.302496,166.981313 210.618342,169.271033 C211.855791,170.494694 212.955568,171.900428 213.683091,173.404055 C214.229783,174.534509 214.228783,176.387356 214.9631,177.323587 C213.165772,174.905078 210.886892,172.951214 208.638584,170.859535 C207.075238,169.404855 203.950944,165.678852 201.196906,165.719988 Z M200.41897,176.096698 C200.227148,176.031957 198.485169,175.539368 198.081944,175.776984 C198.679388,175.510035 199.412106,175.184941 200.068895,175.097983 C204.35311,174.529024 209.561066,178.239232 210.13633,181.81909 C209.657576,180.592826 207.111145,179.578489 205.959616,178.968568 C204.136711,178.002484 202.395531,176.832456 200.41897,176.096698 Z M202.227687,183.908269 C202.969797,184.089822 204.54713,185.083504 205.275252,185.072742 C202.345977,185.143906 199.703236,184.81829 196.883858,184.158729 C197.036117,184.200212 198.643022,183.702937 198.694974,183.695647 C199.910043,183.523987 201.052381,183.620492 202.227687,183.908269 Z M190.882541,197.765243 C195.171151,197.522941 200.218656,198.149351 204.314046,199.181739 C206.346955,199.694288 208.253382,200.468058 210.006351,201.476666 C211.420436,202.290531 213.935896,203.408661 214.881616,204.614097 C211.142494,198.162369 203.032039,194.811448 194.722769,196.473197 C193.615199,196.695886 191.914181,197.749796 190.882541,197.765243 Z M189.923153,210.197773 C192.611453,209.233424 195.584487,208.30431 198.505969,208.169273 C201.277391,208.042395 204.351332,208.458613 206.915546,209.342078 C206.033367,209.102206 203.92333,209.674289 202.995793,209.779298 C201.699199,209.926138 200.399608,210.077837 199.099817,210.196558 C197.506299,210.342009 195.898395,210.422718 194.298883,210.41942 C193.159543,210.41699 190.979371,209.87858 189.923153,210.197773 Z M179.458947,227.410508 C179.711912,231.383499 182.010574,234.84533 185.39043,237.491388 C188.973097,240.296087 193.769036,241.572686 196.369816,245.319691 C197.637437,247.145462 198.312809,249.270812 198.20431,251.417686 C198.148362,252.524014 197.870221,253.636069 197.5695,254.712196 C197.371684,255.420184 196.66734,256.580144 196.667939,257.270775 C196.69911,253.384221 196.751661,248.859281 194.031592,245.598095 C191.300932,242.324066 186.539161,241.170701 183.203065,238.482813 C179.924714,235.841442 177.437828,232.389157 176.877749,228.498264 C176.425569,225.354411 176.648562,219.871892 179.90773,217.738557 C179.246345,218.128392 179.377224,220.111764 179.361438,220.669267 C179.298097,222.900321 179.317079,225.185182 179.458947,227.410508 Z M177.005789,242.672904 C177.402221,243.19257 179.575399,243.82436 180.213805,244.182606 C181.67045,245.000116 183.07914,245.92923 184.234665,247.059684 C186.55111,249.326146 188.044121,252.504886 188.151821,255.553623 C188.151821,254.833139 186.505553,253.096583 186.043183,252.481107 C185.275297,251.458613 184.407904,250.511969 183.524526,249.564283 C181.371329,247.253734 179.135209,244.999942 177.005789,242.672904 Z M229.167807,153.791051 C230.371887,154.841663 231.178936,156.147595 231.842519,157.49987 C233.373295,160.619424 233.65823,164.217333 232.431571,167.500388 C232.634582,166.795698 232.030544,165.31585 231.860502,164.601614 C231.488248,163.038626 230.906389,161.56225 230.298355,160.059664 C229.118053,157.144401 228.163741,154.41208 226.113648,151.858014 C226.644354,152.52556 228.442481,153.157872 229.167807,153.791051 Z M171.509602,41.9832998 C171.510002,42.3148163 172.426549,43.2758671 172.633357,43.6374111 C173.149677,44.5392749 173.557297,45.4857459 173.696967,46.4924453 C173.85542,47.6336606 173.6616,48.7505762 173.315522,49.8605491 C173.109914,50.5202844 172.131624,51.7949741 172.132423,52.3894475 C171.972572,48.891167 171.198691,45.5298324 171.509602,41.9832998 Z M179.146978,48.8048339 C179.312224,50.0477605 178.906202,51.4491555 178.183074,52.546805 C178.314952,52.2364639 177.729296,50.1642252 177.710314,49.7849773 C177.650969,48.6118253 177.77925,47.4056953 177.856378,46.2332376 C177.857178,46.8738803 179.039478,47.9958294 179.146978,48.8048339 Z M118.377388,50.3732542 C117.142336,51.8857333 115.738043,53.3032702 114.227248,54.6164922 C113.2036,55.5060327 111.243024,56.5057893 110.46315,57.5267214 C113.964293,51.8147436 118.00913,46.8878178 122.764906,41.8951095 C122.049172,42.8155452 121.862346,44.8121078 121.337434,45.8885819 C120.563354,47.4758692 119.527518,48.9645693 118.377388,50.3732542 Z M124.275361,52.8515919 C124.845431,52.5155626 125.378934,50.859195 125.81333,50.3013446 C126.54465,49.3623371 127.437619,48.4554398 128.390733,47.6728177 C128.186123,47.8927295 127.788693,49.7158968 127.5657,50.0739694 C126.843372,51.2344508 125.56616,52.1809219 124.275361,52.8515919 Z', id: 'Lights', fillOpacity: '0.6', fill: '#FFFFFF', fillRule: 'evenodd' }),
+                    React.createElement(facialHair_1.default, null),
+                    this.props.children))));
+    };
+    LongHairCurvy.optionValue = 'LongHairCurvy';
+    return LongHairCurvy;
+}(React.Component));
+exports.default = LongHairCurvy;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairDreads.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairDreads.d.ts
new file mode 100644
index 000000000..bf4e1ec65
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairDreads.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+export default class LongHairDreads extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairDreads.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairDreads.js
new file mode 100644
index 000000000..5eb49479b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairDreads.js
@@ -0,0 +1,56 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var LongHairDreads = /** @class */ (function (_super) {
+    __extends(LongHairDreads, _super);
+    function LongHairDreads() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    LongHairDreads.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M85.718098,185.073467 C86.8059563,185.024663 87.900098,185 89,185 L89,185 L93,185 L93,166.610951 C81.2286384,161.018987 71.7176526,151.441235 66.2110974,139.621749 C63.4467803,131.013632 63.6113966,121.686985 63.000708,112.826222 C62.1957105,101.145772 62.8887367,89.7481762 65.5369124,78.2476834 C67.9263583,67.8722634 71.3610508,62.3068417 79.1631677,53.9925443 C83.5224388,49.3467459 90.0678681,49.0779432 96.5828586,47.4293172 C103.17612,45.7598396 109.194306,43.2191332 113.317676,38.4387068 C122.400941,48.8499369 146.671683,45.1030183 155.554378,56.4493915 C166.355804,70.2471725 166.476604,79.1499376 167.747424,95.0917937 C168.700138,107.043152 167.218859,128.656014 166.803718,141.630125 C161.185514,152.525228 152.097197,161.339247 141,166.610951 L141,185 L145,185 C151.635699,185 158.061736,185.89767 164.1633,187.578199 C162.113115,190.752042 159.66929,193.757151 157.112045,196.551224 C153.280561,200.738743 149.430596,205.07041 145.111547,208.917959 C140.170678,213.319433 135.443967,216.514694 132.444114,221.999991 C131.086326,224.482676 128.707208,227.093643 131.224932,229.817026 C133.524148,232.304244 137.149083,231.79157 139.609734,229.99245 C143.247171,227.332528 145.947527,223.133676 149.2996,220.076669 C146.062216,225.891963 141.557817,234.561189 143.870623,241.081807 C144.65714,243.298862 145.455615,243.254893 146.671536,244.732627 C148.591355,244.77569 149.350151,245.644199 148.948467,247.337701 C149.128382,247.821818 149.308297,248.305028 149.488756,248.789145 C150.944383,251.382887 153.73062,253.199684 157.268587,251.977153 C168.828809,247.982737 155.493353,230.015568 168.22112,224.674872 C170.498594,227.504326 167.135107,235.453723 167.044334,238.930932 C166.932906,243.218176 167.166089,252.943574 173.685972,254.109896 C182.182202,255.630241 178.905139,247.513126 179.240509,244.059941 C179.630235,240.043766 182.101213,234.747946 184.111805,231.19141 C182.888817,234.970512 180.603189,243.344644 186.927937,245.060811 C194.245208,247.046687 193.409228,238.475373 194.5197,234.910224 C194.748535,240.185647 201.565196,252.659813 207.724704,242.806586 C210.898493,237.730613 208.733533,229.366 208.385661,223.95323 C212.799287,228.512903 216.32584,222.602417 216.224196,219.322843 C217.902135,224.075166 224.207315,237.325369 229.795009,226.807615 C233.19274,220.412559 229.568892,211.82266 227.311529,205.648358 C233.255792,206.168285 232.061613,200.411919 231.17617,197.553001 C229.869476,193.331485 230.56685,192.711833 230.835907,188.347077 C239.08591,193.151981 238.833159,180.113465 238.377664,176.915484 C237.232404,168.863643 230.969077,161.653567 226.135287,154.862787 C222.669068,149.991702 216.20028,141.510593 218.096726,135.636824 C220.053506,138.105004 224.604107,138.079166 226.413041,135.494944 C227.944765,133.306899 226.321725,129.699141 225.582497,127.51291 C223.561578,121.532617 219.523001,117.668749 215.871976,112.532035 C208.763972,102.531035 209.78639,89.3991407 209.129238,78.2191259 C208.309564,64.2703984 205.315147,50.5387982 192.648801,40.3918378 C185.862036,34.9554966 177.590835,30.4783232 171.278589,24.7101717 C169.557166,23.1372455 168.829352,21.1885396 167.213378,19.672275 C165.399552,17.9706136 164.553244,18.373591 163.055221,15.951194 C160.386934,11.6367527 157.252824,7.59700681 150.804147,7.39438491 C146.585112,7.26247669 141.249081,10.823092 137.446405,10.3027118 C134.324254,9.87616325 132.352254,5.42437419 129.78996,3.93032097 C125.824219,1.61762086 123.056462,2.51559399 118.817859,3.85507435 C112.508874,5.8486563 108.488235,6.54355423 102.06293,4.16059373 C97.6906135,2.53871192 93.5645254,-0.846479064 88.4018873,0.357013447 C84.3524397,1.30167574 82.5435053,4.56991717 80.1584078,7.07481345 C77.6972133,9.66084915 78.8865008,8.80593884 75.2887432,9.38026087 C71.6083661,9.9681817 68.7020041,10.5017074 65.9103313,12.9118655 C61.397779,16.8074642 64.5237352,22.8666297 60.95696,26.3007763 C59.0317058,28.154744 55.0219374,29.0377585 52.7922952,30.954734 C50.3582782,33.0471337 48.3677981,35.5901066 46.5441878,38.0655389 C42.992632,42.8881215 40.5678554,48.1435988 37.9642508,53.3460408 C33.1206766,63.0274694 28.8027153,73.0171372 26.9622549,83.4183949 C26.0170215,88.7645307 24.4238764,93.9946236 23.4503783,99.3303337 C22.6997357,103.444873 23.0198867,107.95151 21.5539323,111.946834 C19.8145722,116.686464 15.6553275,121.042608 13.4023127,125.704271 C10.4144183,131.887186 8.40763163,137.818976 7.77222166,144.475128 C7.14822625,151.019317 8.88486854,156.786109 9.65073052,163.202016 C10.0942673,166.919017 9.32731826,167.341033 6.77100254,170.849066 C4.80389503,173.548878 2.81124068,176.221946 1.54639979,179.227278 C-0.815325022,184.841763 -0.684329469,190.304395 3.42490864,195.240301 C6.24484612,198.627758 15.7238148,202.173415 14.9476254,194.622463 C14.5872518,191.114429 10.1763434,189.527451 11.0188459,185.502664 C11.6020751,182.715366 14.443211,180.786605 17.8920358,179.924895 C20.328227,179.316576 21.5278419,179.343321 22.6269,182.014575 C23.6232272,184.435613 22.3024007,189.72146 21.996382,192.265793 C21.8735397,193.288422 21.691994,194.184582 21.5686081,195.131511 C20.7005588,201.806248 20.5407551,207.947459 16.8870119,214.076432 C14.6426939,217.842389 10.2513533,223.149088 15.258536,226.778604 C19.2177543,229.649308 26.0490909,227.900051 29.1359115,224.896532 C32.3923196,228.923586 31.668311,233.320073 30.4502154,237.765516 C29.6941373,240.525616 27.6264731,244.567629 30.8812505,246.798736 C35.2888976,249.820386 42.4838692,245.061265 45.7886533,242.659719 C47.6992316,246.926565 49.4918595,262.485842 57.0243756,253.211017 C59.2224919,250.505765 62.8816706,247.867147 63.5785017,244.677325 C64.7346326,239.386945 63.9046317,233.818695 64.3834993,228.474826 C66.7870774,235.472308 68.4211208,238.262053 69.8925107,245.444931 C70.7774101,249.766172 71.124195,264.264472 80.0666799,262.354749 C86.9474795,260.885627 82.5468986,251.830921 81.6679782,248.139757 C79.9846038,241.070655 79.1724081,238.077382 77.5455629,230.999667 C80.078506,235.625521 82.2918416,240.371497 84.725315,245.034067 C87.115848,249.613685 97.8039252,259.060923 100.930715,255.083614 C104.057505,251.106306 96.435013,245.438857 94.7010885,240.623528 C91.0924599,230.599863 86.7201436,220.618354 85.6835937,210.116466 C85.1851583,205.067237 86.1200644,200.404213 86.5299011,195.413459 C86.8096981,192.003861 86.3887166,188.510775 85.718098,185.073467 Z', id: path2 })),
+            React.createElement("mask", { id: mask2, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Long-Hair/Dreads', mask: "url(#" + mask2 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement("g", { id: 'template-for-hairstyles', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(63.000000, 87.000000)' }),
+                    React.createElement(facialHair_1.default, null),
+                    React.createElement("g", { id: 'Hair', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(16.000000, 14.000000)' },
+                        React.createElement("mask", { id: mask1, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path2 })),
+                        React.createElement("use", { id: 'No-Woman', fill: '#8D5A5A', xlinkHref: '#' + path2 }),
+                        React.createElement(HairColor_1.default, { maskID: mask1 }),
+                        React.createElement("path", { d: 'M85.718098,185.073467 C86.8059563,185.024663 87.900098,185 89,185 L89,185 L93,185 L93,166.610951 C81.2286384,161.018987 71.7176526,151.441235 66.2110974,139.621749 C66.7437304,141.280375 67.3851037,142.912325 68.1617154,144.509125 C73.916823,156.341882 81.4183567,166.92083 84.4877837,179.589912 C84.9233139,181.387079 85.3569126,183.222183 85.718098,185.073467 Z M164.1633,187.578199 C158.061736,185.89767 151.635699,185 145,185 L145,185 L141,185 L141,166.610951 C151.900717,161.432585 160.863061,152.836228 166.502046,142.206866 C166.424719,145.200638 166.492065,148.178617 166.874747,151.055581 C167.944997,159.099715 170.876362,166.366 169.515856,174.635875 C168.770949,179.167686 166.790265,183.511457 164.1633,187.578199 Z', id: 'Shadows', fillOpacity: '0.24', fill: '#000000', mask: "url(#" + mask1 + ")" }),
+                        React.createElement("path", { d: 'M49.3607552,108.248307 C49.2357387,105.826133 47.3806025,97.711311 49.6885159,96.3093564 C52.2181977,94.7715832 51.6909542,104.01582 51.7170446,104.962941 C51.7605286,106.500263 52.928074,118.098087 50.7897482,118.046647 C48.6579451,117.995659 49.4428313,109.828495 49.3607552,108.248307 Z M57.7950752,165.998415 C57.7863784,167.012316 56.722651,166.95095 55.9633116,166.68563 C55.0256879,166.358041 55.5996767,164.201639 55.5502136,163.49457 C55.4197616,161.635525 54.5272525,156.156756 55.8904759,154.62169 C58.6158357,151.553363 57.8059462,164.569838 57.7950752,165.998415 Z M32.1210881,179.161492 C34.0501471,179.106894 32.2645853,141.329473 29.29952,141.371437 C27.2171799,141.400766 30.6611128,179.198041 32.1210881,179.161492 Z M34.3531219,198.516092 C31.9555228,198.516092 32.3963419,206.978357 33.8084848,207.654742 C35.9484412,208.679924 37.0349977,198.516092 34.3531219,198.516092 Z M49.5898072,202.054956 C49.6110057,203.112626 48.4113908,203.129321 47.6107416,202.798574 C46.701926,202.423155 47.082411,199.293461 47.0465367,198.598576 C46.9334783,196.41149 45.0299661,187.926664 46.7611729,186.367683 C48.7353466,184.59031 48.7782871,186.540953 49.3093354,187.8662 C50.8731288,191.768841 49.505557,197.898275 49.5898072,202.054956 Z M190.242397,122.33319 C190.352194,123.795609 191.311016,133.35074 189.717871,134.079016 C186.975661,135.332969 188.156795,129.428696 188.167666,128.666127 C188.274745,121.229044 187.19906,113.85423 186.381017,106.456855 C186.225562,105.052193 183.755671,94.2318284 185.564605,93.3352452 C188.272028,91.9937546 187.86817,95.5809897 188.023082,96.7451491 C189.152035,105.213731 189.651014,113.824449 190.242397,122.33319 Z M187.023004,155.587221 C184.490605,155.085459 183.16543,163.680835 184.321017,164.602687 C186.238118,166.132789 189.670093,156.113348 187.023004,155.587221 Z M186.754925,193.385172 C185.616188,193.158658 177.321615,209.117567 178.004314,210.020016 C179.303942,211.738731 190.833725,194.199633 186.754925,193.385172 Z M166.332555,200.758587 C164.551342,199.95631 156.998715,211.509915 158.926686,212.377619 C160.674743,213.163653 168.488275,201.725562 166.332555,200.758587 Z M208.425286,157.447168 C206.274459,157.447168 206.370123,169.269251 208.025233,170.015125 C209.736329,170.785817 210.967469,157.447168 208.425286,157.447168 Z M178.139603,48.8435128 C177.531371,47.9735519 170.964743,40.2233192 175.668081,41.3306242 C177.959145,41.8698375 181.116083,48.6833281 182.149372,50.7413632 C182.743472,51.9235715 186.133593,57.2006425 182.541271,56.8270286 C181.563968,56.7259543 178.951667,50.0063184 178.139603,48.8435128 Z M155.04775,33.3564939 C154.201443,33.7373274 154.215575,34.0946972 155.090147,34.4281522 C155.936998,34.0473186 155.922322,33.6904 155.04775,33.3564939 Z M70.6188876,41.486432 C68.6137316,43.3296843 61.07578,54.0047545 58.4928303,54.1116947 C53.7862308,54.3066237 62.7711125,45.0867526 63.7902688,43.9135688 C64.2452201,43.387441 66.275923,40.8222295 67.5119557,40.1914176 C68.7729918,39.5475202 72.9556091,39.3322861 70.6188876,41.486432 Z M43.2540252,69.9805849 C41.0711283,69.5519216 37.4190158,80.245492 38.693097,81.5359942 C40.6167205,83.4857354 45.7005438,70.4661025 43.2540252,69.9805849 Z M68.1928608,188.992366 C68.6054153,190.333405 72.8244505,200.071733 71.7639844,201.353211 C70.1425747,203.310623 69.6772959,200.536495 69.1467911,199.385872 C67.9689182,196.830588 64.9087316,190.540066 65.4006444,187.850317 C65.8784249,185.241788 67.775958,187.648619 68.1928608,188.992366 Z M59.986234,211.816206 C57.6913658,211.816206 57.9560747,221.618156 59.3225594,222.200687 C61.4391432,223.102685 62.8012795,211.816206 59.986234,211.816206 Z M221.791072,203.446532 C221.927503,204.049819 223.845148,209.009228 221.128485,208.290879 C219.566322,207.878008 219.325529,203.506094 218.926564,202.180847 C217.697597,198.095009 213.646519,193.018282 213.294842,188.98659 C212.955123,185.090266 215.135302,186.575246 216.80998,189.875503 C219.046145,194.283064 220.722996,198.746577 221.791072,203.446532 Z M202.089015,202.950817 C199.957212,202.941341 199.853937,213.724254 201.187265,214.35281 C203.051098,215.231344 204.808395,202.950817 202.089015,202.950817 Z M208.249611,114.654432 C209.831341,114.242012 204.839921,101.328868 203.071753,101.471004 C200.377376,101.688494 205.847663,115.273512 208.249611,114.654432 Z M181.434114,170.746831 C180.587263,171.127665 180.601939,171.485034 181.476511,171.818489 C182.322818,171.437656 182.308686,171.080286 181.434114,170.746831 Z M157.216135,225.987499 C158.009718,225.987499 158.337478,224.763778 157.165041,224.736253 C156.389939,224.742571 155.980645,225.987499 157.216135,225.987499 Z M58.6844317,170.628746 C58.7137834,168.720066 56.215084,170.119764 56.230847,171.730185 C56.26346,174.943806 58.6317074,173.476424 58.6844317,170.628746 Z M52.5187808,122.883143 C51.7148704,122.883143 51.3854791,124.119498 52.5698745,124.148828 C53.3536737,124.142962 53.7673152,122.883143 52.5187808,122.883143 Z M33.3865269,185.392722 C33.3087993,183.451554 31.6863025,185.43604 31.7770753,185.438747 C32.0651568,185.445967 33.4474045,186.856043 33.3865269,185.392722 Z M37.5995831,84.0632577 C35.2318792,84.0632577 35.5754028,89.8168218 37.0864719,90.1859235 C39.6063697,90.801845 39.9509805,84.0632577 37.5995831,84.0632577 Z M50.212933,208.325849 C47.9273051,208.325849 47.7729369,216.139704 49.3503191,216.625673 C51.8011861,217.379669 52.5931385,208.325849 50.212933,208.325849 Z M31.4567613,213.932223 C30.5849071,214.323435 30.5990394,214.691634 31.4991582,215.035467 C32.371556,214.644256 32.3568801,214.276959 31.4567613,213.932223 Z M201.455507,217.282881 C199.135636,217.282881 199.226409,226.836207 200.65051,227.481458 C202.64099,228.383907 204.139014,217.282881 201.455507,217.282881 Z M177.94561,226.161536 C175.534966,225.679629 174.272299,233.567034 175.395817,234.451885 C177.248236,235.910694 180.42148,226.656078 177.94561,226.161536 Z M157.46508,233.451204 C155.467534,233.451204 155.95836,237.025805 157.110686,237.557799 C159.104971,238.478297 159.694179,233.451204 157.46508,233.451204 Z M86.479514,19.5090896 C84.8080977,19.5090896 74.3192131,24.2532644 78.2392958,25.6588288 C80.6358078,26.5179603 90.7371413,19.5090896 86.479514,19.5090896 Z', id: 'Highlights', fillOpacity: '0.300000012', fill: '#FFFFFF', mask: "url(#" + mask1 + ")" })),
+                    this.props.children,
+                    React.createElement("g", { id: 'Group-74', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(44.000000, 33.000000)' })))));
+    };
+    LongHairDreads.optionValue = 'LongHairDreads';
+    return LongHairDreads;
+}(React.Component));
+exports.default = LongHairDreads;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFrida.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFrida.d.ts
new file mode 100644
index 000000000..2a6b119c7
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFrida.d.ts
@@ -0,0 +1,15 @@
+import * as React from 'react';
+export default class LongHairFrida extends React.Component {
+    static optionValue: string;
+    private filter1;
+    private filter2;
+    private filter3;
+    private filter4;
+    private filter5;
+    private filter6;
+    private filter7;
+    private mask1;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFrida.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFrida.js
new file mode 100644
index 000000000..f1c872f06
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFrida.js
@@ -0,0 +1,121 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var LongHairFrida = /** @class */ (function (_super) {
+    __extends(LongHairFrida, _super);
+    function LongHairFrida() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.filter2 = lodash_1.uniqueId('react-filter-');
+        _this.filter3 = lodash_1.uniqueId('react-filter-');
+        _this.filter4 = lodash_1.uniqueId('react-filter-');
+        _this.filter5 = lodash_1.uniqueId('react-filter-');
+        _this.filter6 = lodash_1.uniqueId('react-filter-');
+        _this.filter7 = lodash_1.uniqueId('react-filter-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    LongHairFrida.prototype.render = function () {
+        var _a = this, filter1 = _a.filter1, filter2 = _a.filter2, filter3 = _a.filter3, filter4 = _a.filter4, filter5 = _a.filter5, filter6 = _a.filter6, filter7 = _a.filter7, mask1 = _a.mask1, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path2, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("filter", { x: '-3.8%', y: '-6.7%', width: '107.7%', height: '126.7%', filterUnits: 'objectBoundingBox', id: filter5 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' }))),
+                React.createElement("filter", { x: '-6.7%', y: '-3.4%', width: '113.3%', height: '113.8%', filterUnits: 'objectBoundingBox', id: filter6 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' }))),
+                React.createElement("filter", { x: '-6.7%', y: '-3.4%', width: '113.3%', height: '113.8%', filterUnits: 'objectBoundingBox', id: filter7 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' }))),
+                React.createElement("filter", { x: '-3.8%', y: '-3.8%', width: '107.7%', height: '115.4%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' }))),
+                React.createElement("filter", { x: '-2.5%', y: '-2.5%', width: '105.0%', height: '110.0%', filterUnits: 'objectBoundingBox', id: filter2 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' }))),
+                React.createElement("filter", { x: '-2.7%', y: '-2.7%', width: '105.4%', height: '110.8%', filterUnits: 'objectBoundingBox', id: filter3 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' }))),
+                React.createElement("filter", { x: '-1.8%', y: '-1.9%', width: '103.6%', height: '107.4%', filterUnits: 'objectBoundingBox', id: filter4 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' }))),
+                React.createElement("path", { d: 'M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path2 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Long-Hair/Frida', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement("g", { id: 'Cabello', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(57.000000, 12.000000)' },
+                        React.createElement("path", { d: 'M132,85.9365741 L132,86.1659169 C137.155374,87.0308248 141.196116,91.1828748 141.893354,96.3931952 C144.449672,93.4871212 146,89.6746099 146,85.5 C146,83.370043 145.596416,81.3343479 144.861548,79.4652142 C148.026608,76.4588698 150,72.2098901 150,67.5 C150,61.6639649 146.970105,56.5355997 142.397534,53.6021248 C143.424844,51.4510861 144,49.0427105 144,46.5 C144,38.865183 138.814518,32.4415002 131.77335,30.5587463 C131.922635,29.560863 132,28.5394662 132,27.5 C132,16.1781626 122.821837,7 111.5,7 C108.870853,7 106.357304,7.49493913 104.047446,8.3967274 C100.317449,3.30576666 94.2947759,0 87.5,0 C83.2377504,0 79.2793114,1.30076749 76,3.52698535 C72.7206886,1.30076749 68.7622496,0 64.5,0 C57.7052241,0 51.6825514,3.30576666 47.9525545,8.3967274 C45.6426956,7.49493913 43.1291474,7 40.5,7 C29.1781626,7 20,16.1781626 20,27.5 C20,28.5394662 20.0773647,29.560863 20.2266501,30.5587463 C13.1854816,32.4415002 8,38.865183 8,46.5 C8,48.6917361 8.4273349,50.7836628 9.20323008,52.6970055 C3.75045759,55.3899422 0,61.0069879 0,67.5 C0,72.9379417 2.63063706,77.7614652 6.68874609,80.7674054 C6.2406808,82.2665254 6,83.8551557 6,85.5 C6,89.6746099 7.55032816,93.4871212 10.1066457,96.3931952 C10.8038839,91.1828748 14.8446259,87.0308248 20,86.1659169 L20,85.9365741 C20.0276665,85.957925 20.0554443,85.9790669 20.0833333,86 C22.985911,38.8525302 68.5527463,55.7423492 76.000002,29.3361688 C83.4472619,55.7423461 129.014089,38.8525344 131.916667,86 C131.944556,85.9790669 131.972333,85.957925 132,85.9365741 Z M52,168.610951 L52,172.811832 C51.1847358,172.935746 50.3498715,173 49.5,173 C42.6790709,173 36.8248202,168.861157 34.3116389,162.957863 C25.7536314,162.348807 19,155.213101 19,146.5 C19,145.029028 19.1924867,143.603013 19.5536459,142.245771 C12.8575367,140.144362 8,133.88945 8,126.5 C8,122.755519 9.24731211,119.302363 11.3491137,116.533355 C13.0865598,119.870864 16.346706,122.289132 20.2085808,122.867187 C21.9518066,143.114792 34.4692178,160.282984 52,168.610951 Z M100,168.610951 L100,172.811832 C100.815264,172.935746 101.650128,173 102.5,173 C109.320929,173 115.17518,168.861157 117.688361,162.957863 C126.246369,162.348807 133,155.213101 133,146.5 C133,145.029028 132.807513,143.603013 132.446354,142.245771 C139.142463,140.144362 144,133.88945 144,126.5 C144,122.755519 142.752688,119.302363 140.650886,116.533355 C138.91344,119.870864 135.653294,122.289132 131.791419,122.867187 C130.048193,143.114792 117.530782,160.282984 100,168.610951 Z', fill: '#1F3540' })),
+                    React.createElement("g", { id: 'Ornamentos', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(67.000000, 0.000000)' },
+                        React.createElement("g", { id: 'hoja', filter: "url(#" + filter5 + ")", opacity: '0.899999976', transform: 'translate(120.000000, 64.500000) scale(1, -1) rotate(-20.000000) translate(-120.000000, -64.500000) translate(107.000000, 57.000000)', fillRule: 'nonzero' },
+                            React.createElement("path", { d: 'M3.61111111,10 C3.61111111,10 1.95,0 13,0 C20.2222222,0 25.2777778,5.71428571 25.2777778,5.71428571 C25.2777778,5.71428571 19.8611111,14.2857143 11.5555556,14.2857143 C5.05555556,14.2857143 3.61111111,10 3.61111111,10 Z', id: 'leaf', fill: '#5DD362' }),
+                            React.createElement("path", { d: 'M25.2777778,5.71428571 C25.2777778,5.71428571 19.8611111,14.2857143 11.5555556,14.2857143 C7.22222222,14.2857143 5.12777778,12.3571429 4.18888889,11.0714286 C2.09444444,12.8571429 1.37222222,14.5 1.37222222,14.5714286 C1.3,14.8571429 1.01111111,15 0.722222222,15 C0.65,15 0.505555556,15 0.433333333,14.9285714 C0.0722222222,14.7857143 -0.0722222222,14.3571429 0.0722222222,14 C0.144444444,13.7857143 1.95,9.85714286 7.43888889,7.28571429 C15.3833333,3.14285714 25.2777778,5.71428571 25.2777778,5.71428571 Z', id: 'leaf', fill: '#42BC53' })),
+                        React.createElement("g", { id: 'hoja', filter: "url(#" + filter6 + ")", transform: 'translate(93.307368, 21.745191) scale(-1, -1) rotate(-120.000000) translate(-93.307368, -21.745191) translate(85.807368, 7.245191)' },
+                            React.createElement("path", { d: 'M15,12 C15,5.9 9,0 9,0 C9,0 1.7,4.3 1,13 C0.3,21.7 6.8,23.7 6.8,23.7 C6.8,23.7 15,20.8 15,12 Z', id: 'leaf', fill: '#5DD362' }),
+                            React.createElement("path", { d: 'M8,29 C8.1,29 8.2,29 8.3,28.9 C8.8,28.7 9.1,28.1 8.9,27.6 C8.4,26.1 8,24.7 7.8,23.2 C10,22.2 15,18.9 15,12 C15,5.9 9,0 9,0 C9,0 8.6,1.1 8,3 C8,3 8,3 8,3 C7.8,3.5 2.8,16.6 7.1,28.3 C7.2,28.7 7.6,29 8,29 Z', id: 'leaf', fill: '#42BC53' })),
+                        React.createElement("g", { id: 'hoja', filter: "url(#" + filter7 + ")", transform: 'translate(29.307368, 59.745191) rotate(-120.000000) translate(-29.307368, -59.745191) translate(21.807368, 45.245191)' },
+                            React.createElement("path", { d: 'M15,12 C15,5.9 9,0 9,0 C9,0 1.7,4.3 1,13 C0.3,21.7 6.8,23.7 6.8,23.7 C6.8,23.7 15,20.8 15,12 Z', id: 'leaf', fill: '#5DD362' }),
+                            React.createElement("path", { d: 'M8,29 C8.1,29 8.2,29 8.3,28.9 C8.8,28.7 9.1,28.1 8.9,27.6 C8.4,26.1 8,24.7 7.8,23.2 C10,22.2 15,18.9 15,12 C15,5.9 9,0 9,0 C9,0 8.6,1.1 8,3 C8,3 8,3 8,3 C7.8,3.5 2.8,16.6 7.1,28.3 C7.2,28.7 7.6,29 8,29 Z', id: 'leaf', fill: '#42BC53' })),
+                        React.createElement("g", { id: 'Flor', filter: "url(#" + filter1 + ")", transform: 'translate(13.000000, 42.000000) scale(-1, 1) translate(-13.000000, -42.000000) translate(0.000000, 29.000000)' },
+                            React.createElement("path", { d: 'M24.4244753,20.9561089 C25.2601813,19.8468762 25.6139026,18.4784184 25.4208747,17.1027473 C25.2278468,15.7270762 24.5099609,14.5094298 23.401533,13.6738657 C23.1024018,13.448127 22.7077101,13.2632031 22.2596302,13.1057873 C22.7130645,12.9646232 23.1137179,12.7934099 23.4204085,12.5786628 C25.7688628,10.9342574 26.3421384,7.68540233 24.6974016,5.33647474 C23.0526648,2.98754715 19.8036678,2.41507618 17.4552135,4.05948158 C17.148523,4.2742286 16.8506035,4.59216121 16.5623958,4.97030055 C16.5681989,4.4950724 16.5289465,4.06126726 16.4191304,3.70296871 C16.0132035,2.3748027 15.1137169,1.2836091 13.8873598,0.632188307 C12.6611446,-0.0200371698 11.2540931,-0.154883395 9.92559572,0.250570203 C7.18364131,1.0892266 5.6350141,4.00181908 6.47286581,6.7436316 C6.58216096,7.10017888 6.78669399,7.47891226 7.05541252,7.86771872 C6.6074755,7.71655089 6.18638481,7.62487741 5.81372806,7.61849197 C2.94678437,7.56848119 0.573854142,9.85989025 0.523370073,12.7271653 C0.504358584,13.8654889 0.853022045,14.9255192 1.46080913,15.7935291 C2.38423063,17.1113044 3.90375474,17.9869973 5.63218533,18.0167186 C6.00484208,18.0231041 6.42832327,17.945939 6.88109576,17.8108811 C6.59932552,18.1901555 6.38197496,18.5617056 6.2605192,18.9140724 C5.69762142,20.5489044 5.99965968,22.2756795 6.92293929,23.5942594 C7.53072638,24.4622693 8.40824188,25.1534041 9.48422896,25.5235908 C12.1953795,26.4571485 15.1603315,25.0102268 16.0934159,22.2994077 C16.2148717,21.947041 16.272275,21.5203224 16.2839005,21.0473654 C16.5573519,21.4328579 16.8436218,21.7550638 17.1409542,21.9792407 C18.2505182,22.81542 19.6186447,23.168668 20.9943157,22.9756401 C22.3707915,22.7827541 23.5887693,22.0653415 24.4244753,20.9561089 Z', fill: '#4ACAD3', fillRule: 'nonzero' }),
+                            React.createElement("path", { d: 'M11.178297,8.63990176 C10.9452631,7.87696713 11.3743225,7.06939957 12.1372572,6.83636565 C12.9001918,6.60333173 13.7077594,7.03239119 13.9407933,7.79532582 C14.1738272,8.55826044 13.7087793,11.9767907 13.7087793,11.9767907 C13.7087793,11.9767907 11.4113309,9.40283638 11.178297,8.63990176 Z M8.9355486,14.4373723 C8.1377895,14.4232361 7.50243635,13.7656743 7.5165726,12.9679152 C7.53070884,12.1701561 8.18827062,11.534803 8.98602972,11.5489392 C9.78378882,11.5630754 12.8914353,13.0618808 12.8914353,13.0618808 C12.8914353,13.0618808 9.73297629,14.4510353 8.9355486,14.4373723 Z M14.9931854,12.4189898 C14.9931854,12.4189898 16.7313261,9.4385895 17.3849366,8.98092648 C18.0385471,8.52326347 18.9389925,8.68203629 19.3966555,9.33564681 C19.8543185,9.98925733 19.6955457,10.8897027 19.0419352,11.3473657 C18.3883247,11.8050287 14.9931854,12.4189898 14.9931854,12.4189898 Z M11.9202121,19.2569641 C11.1657288,18.9973982 10.7651265,18.1754621 11.0246924,17.4209789 C11.2842584,16.6664957 13.670556,14.1745805 13.670556,14.1745805 C13.670556,14.1745805 14.0160946,17.6074345 13.7565287,18.3619178 C13.4966313,19.1159277 12.6746953,19.5165301 11.9202121,19.2569641 Z M17.2395979,17.2963365 C16.6023761,16.8164172 14.9694239,13.7771777 14.9694239,13.7771777 C14.9694239,13.7771777 18.3408473,14.5093818 18.978069,14.9893011 C19.6152908,15.4692204 19.7426018,16.3753059 19.2623511,17.0120544 C18.7824319,17.6492761 17.8763463,17.7765872 17.2395979,17.2963365 Z', fill: '#FFFFFF' })),
+                        React.createElement("g", { id: 'Flor', filter: "url(#" + filter2 + ")", transform: 'translate(20.000000, 16.000000)' },
+                            React.createElement("path", { d: 'M30.5258511,33.0981022 L30.7843694,30.7838831 L33.0980227,30.5247992 C35.9451175,30.2051869 38.2084249,28.4080043 39.1519882,25.7142103 C40.2177395,22.6719541 39.217042,19.3553405 36.6052724,17.4325757 L34.7311566,16.052869 L35.6634061,13.9191036 C36.8915092,11.1127382 36.3082875,8.02353005 34.142278,5.85752056 C31.9762685,3.69151107 28.8870604,3.10828939 26.0801294,4.33582677 L23.9469296,5.26864203 L22.5666572,3.39396053 C20.6438924,0.78558504 17.3267131,-0.217940904 14.2844569,0.847810436 C11.5917943,1.79137373 9.79348029,4.05468111 9.4749994,6.90177585 L9.21591547,9.21542924 L6.90226208,9.47451317 C4.05460165,9.79355975 1.79129427,11.5918737 0.847730981,14.2845363 C-0.0896097682,16.9607941 0.549614762,19.8457897 2.51650298,21.812678 L2.51706867,21.8132437 C2.78576925,22.0819442 3.08049135,22.3348056 3.39388108,22.5656053 L5.26856258,23.9458777 L4.33518163,26.0796431 C3.10877562,28.8865742 3.6919973,31.9757823 5.85800679,34.1417918 C8.02401628,36.3078013 11.1132244,36.891023 13.9201555,35.664617 L16.0539209,34.731236 L17.4341933,36.6059175 C19.3513012,39.2165558 22.6741374,40.217819 25.7169593,39.1526333 C28.4096219,38.2079386 30.2073702,35.9451969 30.5258511,33.0981022 Z', fill: '#FDB599', fillRule: 'nonzero' }),
+                            React.createElement("path", { d: 'M22.8816016,25.1907295 C23.087511,25.9589303 22.6315686,26.7486271 21.8633678,26.9545366 C21.095167,27.1604461 20.3049044,26.703938 20.0995606,25.9363028 C19.8942168,25.1686677 20,20 20,20 C20,20 17.50759,24.5288775 16.9452987,25.0911688 C16.3835731,25.6528945 15.4711225,25.6534601 14.9088312,25.0911688 C14.3465399,24.5288775 14.3471055,23.6164269 14.9088312,23.0547013 C15.4711225,22.49241 20,20 20,20 C20,20 14.831898,20.1063489 14.0636972,19.9004394 C13.2954963,19.6945299 12.8395539,18.904833 13.0454634,18.1366322 C13.2513729,17.3684314 14.0410697,16.912489 14.8092705,17.1183984 C15.5774713,17.3243079 20,20 20,20 C20,20 17.3243079,15.5774713 17.1183984,14.8092705 C16.912489,14.0410697 17.3684314,13.2513729 18.1366322,13.0454634 C18.904833,12.8395539 19.6945299,13.2954963 19.9004394,14.0636972 C20.1063489,14.831898 20,20 20,20 C20,20 22.49241,15.4711225 23.0547013,14.9088312 C23.6169926,14.3465399 24.5288775,14.3465399 25.0911688,14.9088312 C25.6534601,15.4711225 25.6534601,16.3830074 25.0911688,16.9452987 C24.5288775,17.50759 20,20 20,20 C20,20 25.1686677,19.8942168 25.9363028,20.0995606 C26.703938,20.3049044 27.1604461,21.095167 26.9545366,21.8633678 C26.7486271,22.6315686 25.9589303,23.087511 25.1907295,22.8816016 C24.4225287,22.6756921 20,20 20,20 C20,20 22.6751264,24.421963 22.8816016,25.1907295 Z', fill: '#FFFFFF' })),
+                        React.createElement("g", { id: 'Flor', filter: "url(#" + filter3 + ")", transform: 'translate(89.000000, 26.000000)' },
+                            React.createElement("path", { d: 'M34.7579072,29.8221549 C35.9471811,28.2436316 36.4505537,26.2962107 36.1758602,24.338525 C35.9011667,22.3808393 34.8795597,20.6480348 33.3021815,19.4589627 C32.8764948,19.1377192 32.3148182,18.8745582 31.6771661,18.6505434 C32.322438,18.4496561 32.8925986,18.2060063 33.3290428,17.9004048 C36.6710739,15.5602894 37.4868893,10.9369187 35.1463023,7.59421406 C32.8057153,4.25150941 28.1821427,3.43683918 24.8401115,5.77695456 C24.4036673,6.08255608 23.979705,6.53499864 23.5695632,7.07312001 C23.5778216,6.3968338 23.5219623,5.77949571 23.3656856,5.26960932 C22.7880204,3.37952692 21.5079818,1.82667448 19.7627813,0.899652591 C18.0177827,-0.0285144339 16.0154402,-0.220410986 14.1248862,0.356580673 C10.2228742,1.55005325 8.01905852,5.69489638 9.21138596,9.59670651 C9.36692136,10.1041007 9.6579876,10.6430675 10.0403947,11.196369 C9.40294591,10.9812455 8.80370145,10.8507871 8.27338223,10.8417001 C4.19350083,10.7705309 0.816638586,14.0313823 0.744795872,18.1117353 C0.717741062,19.7316573 1.21391599,21.2401619 2.07884376,22.4754068 C3.39294359,24.3507024 5.55534329,25.5968808 8.01503297,25.6391765 C8.54535219,25.6482635 9.14799849,25.5384516 9.79232859,25.3462538 C9.39134786,25.8859905 9.08204129,26.414735 8.9092004,26.9161799 C8.10815356,29.2426717 8.53797723,31.7000054 9.85187515,33.5764461 C10.7168029,34.811691 11.965575,35.7952289 13.4967874,36.322033 C17.3549631,37.6505575 21.5743179,35.5914767 22.9021688,31.7337725 C23.0750097,31.2323275 23.1566991,30.6250741 23.173243,29.95202 C23.5623854,30.5006054 23.9697696,30.9591293 24.3928963,31.2781502 C25.9718913,32.4680977 27.9188405,32.9707967 29.8765262,32.6961032 C31.8353571,32.4216117 33.5686332,31.4006783 34.7579072,29.8221549 Z', fill: '#F7D30C', fillRule: 'nonzero' }),
+                            React.createElement("path", { d: 'M15.9075765,12.2952448 C15.5759513,11.2095302 16.1865359,10.0602994 17.2722506,9.72867419 C18.3579653,9.397049 19.507196,10.0076336 19.8388212,11.0933483 C20.1704464,12.1790629 19.5086475,17.0438945 19.5086475,17.0438945 C19.5086475,17.0438945 16.2392017,13.3809595 15.9075765,12.2952448 Z M12.715973,20.5454914 C11.5807004,20.5253744 10.676544,19.5896134 10.696661,18.4543409 C10.716778,17.3190683 11.652539,16.4149119 12.7878115,16.4350289 C13.9230841,16.4551458 18.3455041,18.5880611 18.3455041,18.5880611 C18.3455041,18.5880611 13.850774,20.5649348 12.715973,20.5454914 Z M21.3364561,17.6731778 C21.3364561,17.6731778 23.8099641,13.4318389 24.7401021,12.7805492 C25.6702401,12.1292596 26.9516432,12.3552055 27.6029329,13.2853435 C28.2542225,14.2154816 28.0282766,15.4968846 27.0981386,16.1481743 C26.1680005,16.799464 21.3364561,17.6731778 21.3364561,17.6731778 Z M16.9633787,27.4041412 C15.889691,27.0347589 15.3196031,25.8650807 15.6889854,24.7913931 C16.0583677,23.7177054 19.4542528,20.1715184 19.4542528,20.1715184 C19.4542528,20.1715184 19.9459808,25.0567338 19.5765985,26.1304214 C19.2067446,27.2034356 18.0370664,27.7735236 16.9633787,27.4041412 Z M24.5332739,24.6140173 C23.6264583,23.9310553 21.3026416,19.6059836 21.3026416,19.6059836 C21.3026416,19.6059836 26.1004365,20.6479665 27.0072521,21.3309285 C27.9140676,22.0138905 28.095241,23.30332 27.4118074,24.209462 C26.7288453,25.1162776 25.4394159,25.297451 24.5332739,24.6140173 Z', fill: '#FFFFFF' })),
+                        React.createElement("g", { id: 'Flor', filter: "url(#" + filter4 + ")", transform: 'translate(48.000000, 0.000000)' },
+                            React.createElement("path", { d: 'M54.1379237,31.5464048 C55.9625462,24.5630399 48.1438056,19.13187 45.1845324,17.3616591 C45.6989766,14.4276922 46.8574047,4.80065356 40.7169237,1.24584505 C34.6121663,-2.28828261 26.9236153,3.44959091 24.6013353,5.39402404 C24.4009276,5.26871855 24.1656352,5.12587117 23.8977086,4.97076479 C20.8314374,3.19565841 13.1300975,-0.380512394 7.84990403,4.73636964 C2.20473848,10.2044755 5.53732179,18.7392794 6.80518652,21.4340926 C4.64577053,23.4449497 -1.57937327,30.0260297 0.986877047,37.024011 C1.69277097,38.9530347 2.99822799,40.4795811 4.86875265,41.5624535 C8.89955964,43.8959428 14.4760657,43.5196765 16.591707,43.2691852 C17.5849083,45.1496134 20.4220029,49.9813784 24.4796026,52.3303784 C26.1496784,53.2972082 27.8550402,53.7431811 29.5502657,53.6552686 C36.4552712,53.2971895 39.4664791,43.6601819 40.2201879,40.7426742 C43.0812084,40.3465884 52.3062726,38.5442744 54.1379237,31.5464048 Z', fill: '#FF7398', fillRule: 'nonzero' }),
+                            React.createElement("path", { d: 'M27.7643057,25.6030632 C27.7643057,25.6030632 31.4492792,33.7908502 28.1176886,34.3138653 C24.7835165,34.8339614 26.6574825,25.7216143 26.6574825,25.7216143 C26.6574825,25.7216143 19.5457139,31.7290717 18.5074329,28.7503567 C17.4680864,25.7710249 26.208593,24.7024398 26.208593,24.7024398 C26.208593,24.7024398 18.2208741,20.0098596 20.8149072,17.8660564 C23.4089403,15.7222531 27.0309781,23.9576566 27.0309781,23.9576566 C27.0309781,23.9576566 28.975509,15.0385915 31.8514465,16.7035111 C34.727384,18.3684307 27.9942413,24.5153028 27.9942413,24.5153028 C27.9942413,24.5153028 36.8711392,23.5256765 36.3635103,26.8673556 C35.8586276,30.2092 27.7643057,25.6030632 27.7643057,25.6030632 Z', fill: '#FFFFFF' }))),
+                    React.createElement("g", { id: 'Arete', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(182.000000, 129.000000)' },
+                        React.createElement("rect", { id: 'Cadenita', fill: '#E6E6E6', x: '9', y: '0', width: '2', height: '39', rx: '1' }),
+                        React.createElement("polygon", { id: 'Rayo', fill: '#9177FF', fillRule: 'nonzero', points: '20 37 10.57 37 17 20 6 20 0 41 8.636 41 4 60' })),
+                    React.createElement(facialHair_1.default, null),
+                    this.props.children))));
+    };
+    LongHairFrida.optionValue = 'LongHairFrida';
+    return LongHairFrida;
+}(React.Component));
+exports.default = LongHairFrida;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFro.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFro.d.ts
new file mode 100644
index 000000000..bd3ade251
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFro.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class LongHairFro extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    private path3;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFro.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFro.js
new file mode 100644
index 000000000..735c68b5f
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFro.js
@@ -0,0 +1,55 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var LongHairFro = /** @class */ (function (_super) {
+    __extends(LongHairFro, _super);
+    function LongHairFro() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.path3 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    LongHairFro.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2, path3 = _a.path3;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M180.665797,104.495381 C181.518431,106.144109 182,108.015816 182,110 L182,123 C182,129.018625 177.569129,134.002364 171.791419,134.867187 C170.048193,155.114792 157.530782,172.282984 140,180.610951 L140,190.054182 C143.832093,191.949549 148.058707,193 152.5,193 C160.121477,193 167.110765,189.906604 172.559029,184.758484 C174.020475,184.918263 175.501874,185 177,185 C195.390093,185 211.259672,172.683502 218.621514,154.88375 C224.900145,149.813883 229,141.454126 229,132 C229,130.214987 228.853847,128.468986 228.57447,126.776775 C230.785923,120.339137 232,113.331199 232,106 C232,93.1344627 228.26103,81.2644681 221.954258,71.7251464 C221.984605,71.1545437 222,70.5793265 222,70 C222,59.0433596 216.493437,49.5565783 208.470603,44.9571334 C201.160166,27.369138 185.740722,14.9905991 167.696954,14.0567347 C163.273738,9.07458291 157.201041,6 150.5,6 C149.549121,6 148.610894,6.0619088 147.688236,6.18239195 C137.909703,2.19640473 127.211351,0 116,0 C104.788649,0 94.0902965,2.19640473 84.3117637,6.18239195 C83.3891064,6.0619088 82.4508793,6 81.5,6 C74.7989589,6 68.7262617,9.07458291 64.3030458,14.0567347 C46.2592779,14.9905991 30.8398341,27.369138 23.5293968,44.9571334 C15.5065631,49.5565783 10,59.0433596 10,70 C10,70.5793265 10.0153947,71.1545437 10.0457422,71.7251464 C3.73896962,81.2644681 0,93.1344627 0,106 C0,113.331199 1.21407678,120.339137 3.42552978,126.776775 C3.14615333,128.468986 3,130.214987 3,132 C3,141.454126 7.0998554,149.813883 13.3784857,154.88375 C20.7403278,172.683502 36.6099075,185 55,185 C56.4981261,185 57.9795252,184.918263 59.4409604,184.758485 C64.8892346,189.906604 71.878523,193 79.5,193 C83.9412925,193 88.1679073,191.949549 92,190.054182 L92,180.610951 C74.4692178,172.282984 61.9518066,155.114792 60.2085808,134.867187 C54.4308707,134.002364 50,129.018625 50,123 L50,110 C50,108.017039 50.4809755,106.146415 51.3326281,104.498428 C54.034525,103.696079 57.0103265,101.444735 59.9905531,98.1675057 C59.9937016,98.1669748 59.9968506,98.1664452 60,98.1659169 L60,98.1571139 C66.866448,90.6014009 73.7548744,77.602262 77.3694073,64.3345491 C88.4864044,66.0717584 101.905207,67.0867832 116.353789,67.0867832 C130.513023,67.0867832 143.683308,66.1120054 154.66752,64.4380466 C158.288087,77.6642508 165.154277,90.6101259 172,98.1475774 L172,98.1659169 C172.006563,98.167018 172.013125,98.1681244 172.019685,98.1692362 C174.995621,101.441388 177.967097,103.690532 180.665797,104.495381 Z', id: path2 }),
+                React.createElement("path", { d: 'M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z', id: path3 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Long-Hair/Fro', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement("path", { d: 'M67,109.777572 C76.0375502,108.717226 88.9217814,89.3309188 94.3694073,69.3345491 C105.486404,71.0717584 118.905207,72.0867832 133.353789,72.0867832 C147.513023,72.0867832 160.683308,71.1120054 171.66752,69.4380466 C177.129582,89.3913728 189.978479,108.706688 199,109.77655 L199,89 C199,66.1159733 187.353465,45.9521405 169.664405,34.1125124 C169.136033,36.5946509 168.784517,39.3353373 168.624132,42.297284 C158.284896,40.892676 146.228147,40.0867832 133.353789,40.0867832 C120.190372,40.0867832 107.88169,40.9292706 97.3896338,42.392803 C97.2315704,39.3922173 96.8778294,36.6175705 96.3431783,34.1074375 C78.6498638,45.9463781 67,66.1127033 67,89 L67,89 L67,109.777572 Z', id: 'Shadow', fillOpacity: '0.16', fill: '#000000', fillRule: 'evenodd' }),
+                    React.createElement("g", { id: 'Hair', strokeWidth: '1', fill: 'none', fillRule: 'evenodd', transform: 'translate(17.000000, 0.000000)' },
+                        React.createElement("mask", { id: mask2, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path2 })),
+                        React.createElement("use", { fill: '#314756', xlinkHref: '#' + path2 }),
+                        React.createElement(HairColor_1.default, { maskID: mask2 })),
+                    React.createElement(facialHair_1.default, null),
+                    this.props.children))));
+    };
+    LongHairFro.optionValue = 'LongHairFro';
+    return LongHairFro;
+}(React.Component));
+exports.default = LongHairFro;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFroBand.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFroBand.d.ts
new file mode 100644
index 000000000..68e07d48c
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFroBand.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+export default class LongHairFroBand extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFroBand.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFroBand.js
new file mode 100644
index 000000000..41aa4609d
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairFroBand.js
@@ -0,0 +1,52 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var LongHairFroBand = /** @class */ (function (_super) {
+    __extends(LongHairFroBand, _super);
+    function LongHairFroBand() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    LongHairFroBand.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M80.0203173,73.8104172 C78.0626651,79.5136273 77,85.6327143 77,92 L77,92 L77,98.1659169 C71.3245733,99.1180731 67,104.054007 67,110 L67,123 C67,129.018625 71.4308707,134.002364 77.2085808,134.867187 C78.9518066,155.114792 91.4692178,172.282984 109,180.610951 L109,191.55498 C104.295298,193.764912 99.0418843,195 93.5,195 C84.6936661,195 76.615743,191.881303 70.3104439,186.688122 C68.4019201,186.894245 66.4633102,187 64.5,187 C43.405572,187 25.1625605,174.791635 16.4510993,157.055039 C8.9342791,151.923647 4,143.288055 4,133.5 C4,131.385405 4.23029535,129.324599 4.66717333,127.341294 C2.29639351,121.011656 1,114.157223 1,107 C1,94.2436789 5.11811695,82.4491956 12.0974246,72.8734763 C12.0329017,72.0908558 12,71.2992702 12,70.5 C12,59.2025056 18.5734777,49.4403292 28.1042855,44.8296184 C36.5367477,26.7016558 54.5576512,13.9359054 75.6500672,13.049296 C80.7818839,8.06730831 87.7827378,5 95.5,5 C97.8269611,5 100.088787,5.27887473 102.253881,5.80502563 C111.775927,2.05800249 122.147627,0 133,0 C143.346018,0 153.255173,1.87043661 162.407758,5.29160393 C163.744126,5.09944416 165.11045,5 166.5,5 C174.217262,5 181.218116,8.06730831 186.349933,13.049296 C207.442349,13.9359054 225.463252,26.7016558 233.895715,44.8296184 C243.426522,49.4403292 250,59.2025056 250,70.5 C250,71.2992702 249.967098,72.0908558 249.902575,72.8734763 C256.881883,82.4491956 261,94.2436789 261,107 C261,114.157223 259.703606,121.011656 257.332827,127.341294 C257.769705,129.324599 258,131.385405 258,133.5 C258,143.288055 253.065721,151.923647 245.548901,157.055039 C236.837439,174.791635 218.594428,187 197.5,187 C195.53669,187 193.59808,186.894245 191.689556,186.688122 C185.384257,191.881303 177.306334,195 168.5,195 C164.481965,195 160.61557,194.350752 157,193.151442 L157,180.610951 C174.530782,172.282984 187.048193,155.114792 188.791419,134.867187 C194.569129,134.002364 199,129.018625 199,123 L199,110 C199,104.054007 194.675427,99.1180731 189,98.1659169 L189,92 C189,86.5585666 188.223906,81.2983998 186.776371,76.3241528 L188.153157,89.1947292 L176.812614,65.1945789 L131.676809,45.6707349 L101.563146,56.2283606 L80.0648273,76.419385 L80.0203173,73.8104172 Z', id: path2 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Long-Hair/Fro-+-Band', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement("mask", { id: mask2, fill: 'white' },
+                        React.createElement("use", { xlinkHref: '#' + path2 })),
+                    React.createElement("use", { id: 'Hair', stroke: 'none', fill: '#314756', fillRule: 'evenodd', xlinkHref: '#' + path2 }),
+                    React.createElement(HairColor_1.default, { maskID: mask2 }),
+                    React.createElement("path", { d: 'M76.6313898,98.975 C76.2155465,96.423245 76,93.8109442 76,91.1521739 C76,62.3493236 101.295912,39 132.5,39 C163.704088,39 189,62.3493236 189,91.1521739 C189,93.8109442 188.784453,96.423245 188.36861,98.975 C184.279562,73.883217 160.823662,54.6456522 132.5,54.6456522 C104.176338,54.6456522 80.7204382,73.883217 76.6313898,98.975 Z', id: 'Band', stroke: 'none', fill: '#92D9FF', fillRule: 'evenodd' }),
+                    React.createElement(facialHair_1.default, null),
+                    this.props.children))));
+    };
+    LongHairFroBand.optionValue = 'LongHairFroBand';
+    return LongHairFroBand;
+}(React.Component));
+exports.default = LongHairFroBand;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairMiaWallace.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairMiaWallace.d.ts
new file mode 100644
index 000000000..0f8d2e2c1
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairMiaWallace.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+export default class LongHairMiaWallace extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairMiaWallace.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairMiaWallace.js
new file mode 100644
index 000000000..50429a1f2
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairMiaWallace.js
@@ -0,0 +1,53 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var LongHairMiaWallace = /** @class */ (function (_super) {
+    __extends(LongHairMiaWallace, _super);
+    function LongHairMiaWallace() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    LongHairMiaWallace.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M148.859344,69 C148.952588,70.3212062 149,71.6550662 149,73 L149,111 C149,133.339168 135.919579,152.623239 117,161.610951 L117,170.317435 C135.145605,171.815797 152.721153,174.335027 163.000169,177 C172.952646,163.439362 185.884594,150.800081 186.000169,126 C186.085192,107.014914 158.324059,30.4276364 146.000169,15 C137.861928,4.81215989 117.30504,1.44935656 93.0001685,1 C68.6952966,0.550643437 48.9231015,6.50878211 41,16 C30.3189583,28.7950013 -0.0850232975,107.014914 4.92293245e-13,126 C0.115574613,150.800081 13.047523,163.439362 23,177 C33.2789946,174.335033 50.8544902,171.815807 69,170.317444 L69,161.610951 C50.0804213,152.623239 37,133.339168 37,111 L37,73 L37,73 C37,71.6550662 37.0474121,70.3212062 37.1406562,69 L65.3735517,69 L69.2529753,47.5561285 L72.058097,69 L148.859344,69 Z', id: path2 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Long-Hair/Mia-Wallace', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement("path", { d: 'M69.0330562,76.212888 C81.9708809,43.1292208 95.6458945,26.5873873 110.058097,26.5873873 C110.596882,26.5873873 139.311316,26.3494141 158.112657,26.226792 C178.767149,35.5853581 193,55.3036503 193,78.114622 L193,93 L110.058097,93 L107.252975,69.820435 L103.373552,93 L69,93 L69,78.114622 C69,77.478246 69.0110772,76.844277 69.0330621,76.2128728 L69.0330562,76.212888 Z', id: 'Shadow', fillOpacity: '0.16', fill: '#000000', fillRule: 'evenodd' }),
+                    React.createElement("g", { id: 'Hair', strokeWidth: '1', fill: 'none', fillRule: 'evenodd', transform: 'translate(40.000000, 19.000000)' },
+                        React.createElement("mask", { id: mask2, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path2 })),
+                        React.createElement("use", { id: 'Combined-Shape', fill: '#E6E6E6', xlinkHref: '#' + path2 }),
+                        React.createElement(HairColor_1.default, { maskID: mask2 })),
+                    React.createElement(facialHair_1.default, null),
+                    this.props.children))));
+    };
+    LongHairMiaWallace.optionValue = 'LongHairMiaWallace';
+    return LongHairMiaWallace;
+}(React.Component));
+exports.default = LongHairMiaWallace;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairNotTooLong.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairNotTooLong.d.ts
new file mode 100644
index 000000000..9053bc63e
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairNotTooLong.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+export default class LongHairNotTooLong extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairNotTooLong.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairNotTooLong.js
new file mode 100644
index 000000000..46c2bf92f
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairNotTooLong.js
@@ -0,0 +1,54 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var LongHairNotTooLong = /** @class */ (function (_super) {
+    __extends(LongHairNotTooLong, _super);
+    function LongHairNotTooLong() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    LongHairNotTooLong.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M59,102.340285 C59,118.921045 59,145.474283 59,182 C59,186.418278 62.581722,190 67,190 L109,190 L109,180.610951 C91.4692178,172.282984 78.9518066,155.114792 77.2085808,134.867187 C71.4308707,134.002364 67,129.018625 67,123 L67,110 C67,106.509412 68.4903619,103.366917 70.8694649,101.174135 C82.4088376,98.5552525 94.9706808,93.6376395 107.341516,86.4953343 C119.473269,79.4910638 129.843979,71.2579416 137.820938,62.752196 C134.394107,70.6604321 130.244513,77.5880409 125.372156,83.5350224 C138.047336,78.0120855 146.677812,69.1324394 151.263585,56.8960843 C151.64142,57.8180234 152.034942,58.738913 152.444252,59.6582378 C162.699828,82.6926393 180.317578,99.018563 198.205873,104.403108 C198.718861,106.513486 199,108.48395 199,110 L199,123 C199,129.018625 194.569129,134.002364 188.791419,134.867187 C187.048193,155.114792 174.530782,172.282984 157,180.610951 L157,190 L175,190 C192.673112,190 207,175.673112 207,158 C207,133.944314 207,115.902549 207,103.874706 C207,103.807916 206.990567,103.721208 206.971823,103.615272 C206.82774,91.3536714 206.623862,84.2237818 206.360189,82.2256031 C201.576875,45.9764505 170.555563,18 133,18 C96.9151011,18 66.8627142,43.8282542 60,78 C54.4771525,78 50,83.5964406 50,90.5 C50,95.0507583 51.6949619,99.1431718 54.8534901,101.273154 C55.7582038,101.883256 57.323834,102.197638 58.9999994,102.340287 Z', id: path2 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Long-Hair/Long-but-not-too-long', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement("g", { id: 'Behind', strokeWidth: '1', fillRule: 'evenodd' },
+                        React.createElement("mask", { id: mask2, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path2 })),
+                        React.createElement("use", { id: 'Combined-Shape', fill: '#944F23', xlinkHref: '#' + path2 }),
+                        React.createElement(HairColor_1.default, { maskID: mask2 })),
+                    React.createElement("g", { id: 'Top', opacity: '0.439990942', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(50.000000, 18.000000)', fillOpacity: '0.159999996' },
+                        React.createElement("path", { d: 'M11.8989604,84.7749122 C25.7109099,83.0145308 41.6792969,77.5379209 57.3415164,68.4953343 C69.4732686,61.4910638 79.8439791,53.2579416 87.8209384,44.752196 C84.3941075,52.6604321 80.2445133,59.5880409 75.3721558,65.5350224 C88.0473359,60.0120855 96.6778122,51.1324394 101.263585,38.8960843 C101.64142,39.8180234 102.034942,40.738913 102.444252,41.6582378 C114.38223,68.4713761 136.296003,86.1944823 157,88.1510343 L157,88.1510343 L157,74 C157,33.1309285 123.869071,-7.50752664e-15 83,0 C46.9151011,6.62868839e-15 16.8627142,25.8282542 10.3212729,60.0063288 C10.214595,60.0021202 10.1074956,60 10,60 C4.4771525,60 0,65.5964406 0,72.5 C0,78.9816827 3.9466744,84.3111215 8.99999442,84.9382803 L8.99999434,85.0927525 C9.31629342,85.0638362 9.63387297,85.0328725 9.95270131,84.9998631 C9.96845895,84.9999543 9.98422521,85 10,85 C10.6492988,85 11.2841443,84.9226474 11.8989604,84.7749122 Z', id: 'Combined-Shape', fill: '#FFFFFF' })),
+                    React.createElement(facialHair_1.default, null),
+                    this.props.children))));
+    };
+    LongHairNotTooLong.optionValue = 'LongHairNotTooLong';
+    return LongHairNotTooLong;
+}(React.Component));
+exports.default = LongHairNotTooLong;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairShavedSides.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairShavedSides.d.ts
new file mode 100644
index 000000000..5899c2cbe
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairShavedSides.d.ts
@@ -0,0 +1,12 @@
+import * as React from 'react';
+export default class LongHairShavedSides extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private mask3;
+    private path1;
+    private path2;
+    private path3;
+    private path4;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairShavedSides.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairShavedSides.js
new file mode 100644
index 000000000..b3e00b26f
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairShavedSides.js
@@ -0,0 +1,62 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var LongHairShavedSides = /** @class */ (function (_super) {
+    __extends(LongHairShavedSides, _super);
+    function LongHairShavedSides() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.mask3 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.path3 = lodash_1.uniqueId('react-path-');
+        _this.path4 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    LongHairShavedSides.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, mask3 = _a.mask3, path1 = _a.path1, path2 = _a.path2, path3 = _a.path3, path4 = _a.path4;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path2, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M156,180.610951 C173.530782,172.282984 186.048193,155.114792 187.791419,134.867187 C193.569129,134.002364 198,129.018625 198,123 L198,110 C198,104.054007 193.675427,99.1180731 188,98.1659169 L188,92 C188,61.072054 162.927946,36 132,36 C101.072054,36 76,61.072054 76,92 L76,92 L76,98.1659169 C70.3245733,99.1180731 66,104.054007 66,110 L66,123 C66,129.018625 70.4308707,134.002364 76.2085808,134.867187 C77.9518066,155.114792 90.4692178,172.282984 108,180.610951 L108,199 L104,199 L104,199 C64.235498,199 32,231.235498 32,271 L32,280 L232,280 L232,271 C232,231.235498 199.764502,199 160,199 L156,199 L156,180.610951 Z M0,5.68434189e-14 L264,5.68434189e-14 L264,280 L0,280 L0,5.68434189e-14 Z', id: path3 }),
+                React.createElement("rect", { id: path4, x: '0', y: '0', width: '112', height: '150', rx: '56' }),
+                React.createElement("path", { d: 'M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z', id: path1 })),
+            React.createElement("mask", { id: mask2, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path2 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Long-Hair/Shaved-Sides', mask: "url(#" + mask2 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement("g", { id: 'Behind', strokeWidth: '1', fill: 'none', fillRule: 'evenodd', transform: 'translate(1.000000, 0.000000)' },
+                        React.createElement("mask", { id: mask3, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path3 })),
+                        React.createElement("g", { id: 'Mask-Hair' }),
+                        React.createElement("path", { d: 'M116.179148,40 L146,40 C171.405098,40 192,60.5949015 192,86 L192,154.108712 C192,180.650314 210.758775,204.349179 222.609956,226.05167 C234.461138,247.754161 215.254522,268.242596 195.770735,276.769484 C190.902336,278.900091 185.645645,280 180.331438,280 L135.26309,280 C78.9108161,280 70.2166412,216.309596 67.6972794,146.504423 L70.2166412,84.1431398 C71.212998,59.4805095 91.4964003,40 116.179148,40 Z', id: 'Hair', fill: '#CCB55A', mask: "url(#" + mask3 + ")" })),
+                    React.createElement("g", { id: 'Top', strokeWidth: '1', fill: 'none', fillRule: 'evenodd', transform: 'translate(77.000000, 36.000000)' },
+                        React.createElement("mask", { id: mask1, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path4 })),
+                        React.createElement("g", { id: 'Mask' }),
+                        React.createElement("path", { d: 'M98.8014742,19.9396383 C107.026909,29.4843994 112,41.9114359 112,55.5 L112,65.5 L112,61.5 C112,45.7605792 105.327989,31.5794902 94.657974,21.6307409 C63.9198041,32.6768506 38.0141969,32.8027026 16.9411526,22.0082968 C6.50516181,31.936614 -1.90326939e-15,45.958626 0,61.5 L0,61.5 L0,65.5 L0,55.5 C-1.66642407e-15,41.8926148 4.98687681,29.4499771 13.2327229,19.8999944 C9.3991564,16.860899 8.25944611,8.18718262 19.4671989,4.87682391 C31.3115751,1.37843003 29.3063159,-13.2020165 47.4575903,-15.9260752 C65.6088648,-18.6501339 63.9714902,-11.3745857 81.028596,-12.3495122 C98.0857017,-13.3244386 103.635746,-29.1131795 106.849606,-25.0739991 C119.588767,-9.06341321 116.420993,9.34036319 98.8014742,19.9396383 Z', id: 'Shadow', fillOpacity: '0.16', fill: '#000000', mask: "url(#" + mask1 + ")" })),
+                    React.createElement("path", { d: 'M90.8779151,52.3613196 C113.02785,65.2272934 140.816672,65.2272934 174.244382,52.3613196 C188.77455,44.5891967 199.330608,29.0424257 182.951044,8.96303524 C180.782417,6.30455678 172.244382,15.6755614 155.351199,16.6504878 C138.458015,17.6254143 142.079654,13.3498661 124.102817,16.0739248 C106.12598,18.7979835 108.111968,33.37843 96.3814191,36.8768239 C84.6508698,40.3752178 86.5778198,49.8635735 90.8779151,52.3613196 Z', id: 'Copet\u00F3n', fill: '#E0C863', fillRule: 'evenodd' }),
+                    React.createElement(facialHair_1.default, null),
+                    this.props.children))));
+    };
+    LongHairShavedSides.optionValue = 'LongHairShavedSides';
+    return LongHairShavedSides;
+}(React.Component));
+exports.default = LongHairShavedSides;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraight.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraight.d.ts
new file mode 100644
index 000000000..7c752b11e
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraight.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+export default class LongHairStraight extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraight.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraight.js
new file mode 100644
index 000000000..1a407f467
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraight.js
@@ -0,0 +1,53 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var LongHairStraight = /** @class */ (function (_super) {
+    __extends(LongHairStraight, _super);
+    function LongHairStraight() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    LongHairStraight.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M133.506381,81.3351151 C137.363649,83.3307002 140,87.3574737 140,92 L140,105 C140,111.018625 135.569129,116.002364 129.791419,116.867187 C128.048193,137.114792 115.530782,154.282984 98,162.610951 L98,162.610951 L98,181 L102,181 C119.490913,181 135.525121,187.236892 148,197.608051 L148,74 C148,53.5654643 139.717268,35.0654643 126.325902,21.6740982 C112.934536,8.28273213 94.4345357,-3.55271368e-15 74,0 C33.1309285,7.10542736e-15 -7.10542736e-15,33.1309285 0,74 L0,257.716445 C13.5691766,255.775526 24,244.105888 24,230 L24,184.423101 C30.9346808,182.200199 38.3271796,181 46,181 L50,181 L50,162.610951 C38.7726252,157.277407 29.6015372,148.317951 24,137.245847 L24,75.2659587 C33.1467898,72.2910056 42.777598,68.0170651 52.3415164,62.4953343 C67.7445474,53.6023901 80.4313947,42.9409152 89.0661426,32.3970356 C90.8310687,37.5951441 93.1752556,42.8009742 96.1104311,47.8848473 C104.877881,63.0705152 117.224186,74.2337047 130,79.9170491 L130,80.1659169 C130.400422,80.233095 130.794121,80.3201038 131.18005,80.4258987 C131.954509,80.7493055 132.730185,81.0524853 133.506381,81.3351151 Z', id: path2 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Long-Hair/Straight', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement("g", { id: 'Hair', strokeWidth: '1', fill: 'none', fillRule: 'evenodd', transform: 'translate(59.000000, 18.000000)' },
+                        React.createElement("mask", { id: mask2, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path2 })),
+                        React.createElement("use", { id: 'Mask-Hair', fill: '#944F23', xlinkHref: '#' + path2 }),
+                        React.createElement(HairColor_1.default, { maskID: mask2 })),
+                    React.createElement("path", { d: 'M192.506381,99.3351151 C197.3745,101.107702 202.263079,102.071957 207,102.148232 L207,102.148232 L207,92 C207,71.5654643 198.717268,53.0654643 185.325902,39.6740982 C198.717268,53.0654643 207,71.5654643 207,92 L207,215.608051 C194.525121,205.236892 178.490913,199 161,199 L157,199 L157,180.610951 L157,180.610951 C174.530782,172.282984 187.048193,155.114792 188.791419,134.867187 C194.569129,134.002364 199,129.018625 199,123 L199,110 C199,105.357474 196.363649,101.3307 192.506381,99.3351151 Z M190.18005,98.4258987 C189.794121,98.3201038 189.400422,98.233095 189,98.1659169 L189,97.9170491 C189.392974,98.0918644 189.786355,98.2614951 190.18005,98.4258987 Z M83,155.245847 C88.6015372,166.317951 97.7726252,175.277407 109,180.610951 L109,199 L105,199 C97.3271796,199 89.9346808,200.200199 83,202.423101 L83,155.245847 Z', id: 'Shadow', fillOpacity: '0.24', fill: '#000000', fillRule: 'evenodd' }),
+                    React.createElement(facialHair_1.default, null),
+                    this.props.children))));
+    };
+    LongHairStraight.optionValue = 'LongHairStraight';
+    return LongHairStraight;
+}(React.Component));
+exports.default = LongHairStraight;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraight2.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraight2.d.ts
new file mode 100644
index 000000000..8bcdb4050
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraight2.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class LongHairStraight2 extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    private path3;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraight2.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraight2.js
new file mode 100644
index 000000000..a79d2ac8f
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraight2.js
@@ -0,0 +1,55 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var LongHairStraight2 = /** @class */ (function (_super) {
+    __extends(LongHairStraight2, _super);
+    function LongHairStraight2() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.path3 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    LongHairStraight2.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2, path3 = _a.path3;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M21,157.540812 L21,69.046252 C21,65.5140485 21.3981158,62.0748299 22.1519234,58.7710202 C25.205041,38.7314193 36.7752683,22.8108863 50,13 C69.9046441,-1.75961713 103.441939,-6.01828252 115.047069,11.5221046 C123.698343,7.68103538 136.519049,11.1821114 146,20 C155.565156,29.4150438 163.19967,50.1973768 158.657409,67.2035172 C158.762104,68.4691962 158.815476,69.7490355 158.815476,71.0408963 L158.815476,92.8921195 C157.934142,87.9183006 153.988995,84.0029116 149,83.1659169 L149,83 C142.963851,61.4642087 125.229516,51.5800472 114.429684,41.777113 C97.5353566,60.6732583 44.8226408,60.7398069 27,98 L27,108 C27,114.018625 31.4308707,119.002364 37.2085808,119.867187 C38.9518066,140.114792 51.4692178,157.282984 69,165.610951 L69,166 C71.9303712,209.855112 62.358462,264.797432 0,248 C13.6057325,240.037752 20.8081123,189.055563 21,157.540812 Z M117,165.610951 C134.530782,157.282984 147.048193,140.114792 148.791419,119.867187 C153.87876,119.105701 157.921895,115.150816 158.815476,110.107881 L158.815476,111.47039 L158.815476,111.47039 C158.815476,127.298552 162.572711,142.900645 169.7782,156.993609 L196.726668,209.701177 C203.689761,223.320048 201.645562,239.173573 192.790715,250.468968 C189.966212,213.288807 158.90349,184 121,184 L121,184 L117,184 L117,165.610951 Z', id: path2 }),
+                React.createElement("path", { d: 'M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z', id: path3 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Long-Hair/Straight', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement("g", { id: 'Hair', strokeWidth: '1', fill: 'none', fillRule: 'evenodd', transform: 'translate(40.000000, 15.000000)' },
+                        React.createElement("mask", { id: mask2, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path2 })),
+                        React.createElement("use", { fill: '#272C2E', xlinkHref: '#' + path2 }),
+                        React.createElement(HairColor_1.default, { maskID: mask2 })),
+                    React.createElement("path", { d: 'M67,113 C84.8226408,80.6646674 137.535357,80.6069148 154.429684,64.2083647 C165.207546,72.6982916 182.891727,79.2665518 188.963018,97.8687161 C182.891727,76.423995 165.207546,66.5601054 154.429684,56.777113 C137.535357,75.6732583 84.8226408,75.7398069 67,113 Z', id: 'Shadow', fillOpacity: '0.16', fill: '#000000', fillRule: 'evenodd' }),
+                    React.createElement(facialHair_1.default, null),
+                    this.props.children))));
+    };
+    LongHairStraight2.optionValue = 'LongHairStraight2';
+    return LongHairStraight2;
+}(React.Component));
+exports.default = LongHairStraight2;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraightStrand.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraightStrand.d.ts
new file mode 100644
index 000000000..8b97dbb02
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraightStrand.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class LongHairStraightStrand extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    private path3;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraightStrand.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraightStrand.js
new file mode 100644
index 000000000..f0ae807b0
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/LongHairStraightStrand.js
@@ -0,0 +1,55 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var LongHairStraightStrand = /** @class */ (function (_super) {
+    __extends(LongHairStraightStrand, _super);
+    function LongHairStraightStrand() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.path3 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    LongHairStraightStrand.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2, path3 = _a.path3;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M8.46130289,88.6935361 C8.16088005,89.7438903 8,90.8531574 8,92 L8,105 C8,111.018625 12.4308707,116.002364 18.2085808,116.867187 C19.9518066,137.114792 32.4692178,154.282984 50,162.610951 L50,181 L46,181 L46,181 C30.3810228,181 15.9236322,185.973344 4.12503673,194.422823 C1.45272918,186.776619 1.52589027e-14,178.557961 1.42108547e-14,170 L0,74 L0,74 C-5.00501776e-15,33.1309285 33.1309285,7.50752664e-15 74,0 L74,0 L74,0 C114.869071,-7.50752664e-15 148,33.1309285 148,74 L148,170 C148,178.557961 146.547271,186.776619 143.874963,194.422823 C132.076368,185.973344 117.618977,181 102,181 L102,181 L98,181 L98,162.610951 C115.530782,154.282984 128.048193,137.114792 129.791419,116.867187 C135.569129,116.002364 140,111.018625 140,105 L140,92 C140,90.3107559 139.650957,88.7030352 139.021057,87.2450254 C126.064756,85.0568849 111.478699,79.7686298 97.1489304,71.4953343 C85.0171781,64.4910638 74.6464677,56.2579416 66.6695083,47.752196 C70.0963393,55.6604321 74.2459335,62.5880409 79.118291,68.5350224 C66.4431108,63.0120855 57.8126345,54.1324394 53.2268621,41.8960843 C52.8490267,42.8180234 52.455505,43.738913 52.0461952,44.6582378 C42.206947,66.7575512 25.5911314,82.6819966 8.46130289,88.6935361 Z', id: path2 }),
+                React.createElement("path", { d: 'M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z', id: path3 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Long-Hair/Straight-+-Strand', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement("g", { id: 'Hair', strokeWidth: '1', fill: 'none', fillRule: 'evenodd', transform: 'translate(59.000000, 18.000000)' },
+                        React.createElement("mask", { id: mask2, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path2 })),
+                        React.createElement("use", { fill: '#ECC797', xlinkHref: '#' + path2 }),
+                        React.createElement(HairColor_1.default, { maskID: mask2 })),
+                    React.createElement("path", { d: 'M59,102.418954 L59,108.837908 C78.9453743,105.750496 99.5895621,88.3902571 111.046195,62.6582378 C111.455505,61.738913 111.849027,60.8180234 112.226862,59.8960843 C116.231662,70.5822127 123.321236,78.70828 133.495584,84.2742862 C134.956498,86.4697241 136.497401,88.5566361 138.118291,90.5350224 C125.443111,85.0120855 116.812635,76.1324394 112.226862,63.8960843 C111.849027,64.8180234 111.455505,65.738913 111.046195,66.6582378 C99.5895621,92.3902571 78.9453743,109.750496 59,112.837908 L59,102.418954 Z M207,101.140388 L207,110.280776 C192.046922,109.412723 173.901259,103.744646 156.14893,93.4953343 C145.87623,87.5643877 136.866205,80.7523483 129.502994,73.639773 C128.137922,71.1289501 126.860094,68.4997578 125.669508,65.752196 C133.646468,74.2579416 144.017178,82.4910638 156.14893,89.4953343 C173.901259,99.7446457 192.046922,105.412723 207,106.280776 L207,101.140388 Z', id: 'Shadow', fillOpacity: '0.16', fill: '#000000', fillRule: 'evenodd' }),
+                    React.createElement(facialHair_1.default, null),
+                    this.props.children))));
+    };
+    LongHairStraightStrand.optionValue = 'LongHairStraightStrand';
+    return LongHairStraightStrand;
+}(React.Component));
+exports.default = LongHairStraightStrand;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/NoHair.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/NoHair.d.ts
new file mode 100644
index 000000000..8a51a2280
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/NoHair.d.ts
@@ -0,0 +1,8 @@
+import * as React from 'react';
+export default class NoHair extends React.Component {
+    static optionValue: string;
+    private filter1;
+    private mask1;
+    private path1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/NoHair.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/NoHair.js
new file mode 100644
index 000000000..5e434b929
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/NoHair.js
@@ -0,0 +1,50 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var NoHair = /** @class */ (function (_super) {
+    __extends(NoHair, _super);
+    function NoHair() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    NoHair.prototype.render = function () {
+        var _a = this, filter1 = _a.filter1, mask1 = _a.mask1, path1 = _a.path1;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("filter", { x: '-0.8%', y: '-2.0%', width: '101.5%', height: '108.0%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' })))),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/No-Hair', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement(facialHair_1.default, null),
+                    this.props.children))));
+    };
+    NoHair.optionValue = 'NoHair';
+    return NoHair;
+}(React.Component));
+exports.default = NoHair;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairDreads01.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairDreads01.d.ts
new file mode 100644
index 000000000..896d9a48b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairDreads01.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class ShortHairDreads01 extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    private path3;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairDreads01.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairDreads01.js
new file mode 100644
index 000000000..cfdb34ee4
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairDreads01.js
@@ -0,0 +1,54 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var ShortHairDreads01 = /** @class */ (function (_super) {
+    __extends(ShortHairDreads01, _super);
+    function ShortHairDreads01() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.path3 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    ShortHairDreads01.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2, path3 = _a.path3;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z', id: path2 }),
+                React.createElement("path", { d: 'M185.831676,73.928751 C187.588868,74.9173665 188.980206,84.8279256 189.047535,88.6176558 C189.08965,90.9562115 189.127358,99.8740101 186.654049,99.1031293 C185.901013,98.868423 184.751682,94.1472484 184.58821,91.3840965 C184.424737,88.6209446 182.855069,79.2200034 180.446757,74.8947261 C179.896491,73.9063366 178.320781,72.1708928 179.001547,71.3348066 C179.846064,70.2980597 180.666198,70.8995898 181.697184,71.3146953 C182.8124,71.7641482 185.6344,73.8180261 185.831676,73.928751 Z M186.636742,70.9565876 C185.890663,71.9188016 180.795829,69.217693 178.671174,68.0439722 C160.825581,58.1840558 157.361562,55.0486831 129.245707,55.4578453 C101.129853,55.8670074 81.8674779,69.0400225 80.7839818,70.3874406 C80.0301584,71.3248831 79.0677773,73.8279219 78.2764086,80.8005402 C77.48504,87.7731584 78.4952061,100.277789 75.6304859,100.262618 C73.1915094,100.249702 72.6608912,76.4770353 73.7137309,67.0463924 C73.8753757,65.5984852 74.4983655,63.0083957 74.0474223,61.7058802 C73.6532986,60.5682485 71.7253768,60.5705662 72.0331217,58.6750651 C72.3829065,56.5173393 74.5584694,57.5890837 75.5060085,56.5574014 C77.3005851,54.602966 74.5321945,54.1404306 74.0730403,52.4306721 C73.3905494,49.8892108 75.3628102,49.2336489 77.1396512,48.4310821 C79.1060001,47.5437559 78.8504766,48.3231462 80.4463492,46.5849138 C78.3147968,45.0224912 77.543628,42.8939014 80.4624425,41.7519655 C81.7019616,41.2669159 84.9268789,41.9089031 85.8980654,41.1801698 C86.1512899,40.9901231 86.251463,39.9008308 86.4074703,39.6780059 C87.9583471,37.4593592 87.5757186,35.8532324 87.4183976,33.3624282 C87.2889936,31.3242265 87.3064008,29.4532263 89.7466834,29.2496048 C91.3750712,29.1138571 92.6993269,30.4441843 94.1582415,30.835866 C95.7767762,31.2705896 95.1688403,31.5877757 96.4369334,30.7150174 C98.6630755,29.1817309 97.1479982,26.1942888 98.913344,24.4120212 C101.335891,21.9662454 102.923881,25.5513084 104.868882,25.8218105 C109.09126,26.4101607 107.736132,22.1218586 110.235861,20.5504965 C113.223647,18.6738677 113.512672,22.8012592 115.378847,22.948264 C116.996068,23.0750722 119.907657,19.9545311 121.317306,19.3731338 C125.499944,17.6471518 127.572378,22.5039387 131.554013,21.8844657 C134.443268,21.434843 135.223305,21.067662 137.830761,22.7115333 C140.361692,24.3070651 140.96306,23.1664535 143.828996,23.1436082 C145.853806,23.128378 147.093982,24.8202575 148.787729,24.9967295 C149.632467,25.085131 150.441078,24.2050888 151.347562,24.2603811 C154.58496,24.4567186 154.789576,28.6430444 157.361562,29.7955753 C159.711524,30.8487786 162.474332,29.3691289 164.806559,29.0953159 C170.497048,28.4275036 166.60015,33.7425217 166.760755,36.914713 C168.994451,37.4358517 171.261648,35.3509661 173.485163,35.7347015 C176.986623,36.3392753 175.664995,39.9680424 174.853429,42.4144804 C177.279589,42.3707762 183.612828,39.6776748 185.184725,43.1220237 C185.995306,44.8980006 184.106797,47.2689496 184.13767,49.0743937 C184.181023,51.615855 186.048513,53.7186196 186.709327,56.1240021 C187.601032,59.3710203 188.871834,68.0740038 186.636742,70.9565876 Z', id: path3 })),
+            React.createElement("mask", { id: mask2, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Short-Hair/Dreads-01', mask: "url(#" + mask2 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement(facialHair_1.default, null),
+                    React.createElement("g", { id: 'Hair', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(1.000000, 0.000000)' },
+                        React.createElement("mask", { id: mask1, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path3 })),
+                        React.createElement("use", { id: 'Dreads-With-Cut', fill: '#2E3257', xlinkHref: '#' + path3 }),
+                        React.createElement(HairColor_1.default, { maskID: mask1 })),
+                    this.props.children))));
+    };
+    ShortHairDreads01.optionValue = 'ShortHairDreads01';
+    return ShortHairDreads01;
+}(React.Component));
+exports.default = ShortHairDreads01;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairDreads02.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairDreads02.d.ts
new file mode 100644
index 000000000..7fb49b885
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairDreads02.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class ShortHairDreads02 extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    private path3;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairDreads02.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairDreads02.js
new file mode 100644
index 000000000..e0260a63f
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairDreads02.js
@@ -0,0 +1,54 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var ShortHairDreads02 = /** @class */ (function (_super) {
+    __extends(ShortHairDreads02, _super);
+    function ShortHairDreads02() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.path3 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    ShortHairDreads02.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2, path3 = _a.path3;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z', id: path2 }),
+                React.createElement("path", { d: 'M153.503392,98.8736491 C157.89934,100.654655 161,104.965228 161,110 L161,123 C161,128.28759 157.580126,132.776426 152.8316,134.375285 C151.985668,145.321578 147.992514,155.385777 141.755762,163.66426 C141.964657,164.471736 142.166135,165.290125 142.311896,166.167999 C142.862922,169.494538 142.191903,172.260864 143.956619,175.261034 C144.414366,176.040649 145.140008,176.50834 145.478876,177.405464 C146.012313,178.819858 145.247,181.999219 147.428222,182 C150.534993,182.00039 148.803043,176.034013 148.024863,174.616105 C146.500469,171.843533 145.563369,171.165421 145.642135,167.571852 C147.387236,168.73171 153.172487,170.947581 155.089787,169.887664 C159.522305,167.44029 148.428013,164.951924 147.651918,164.434653 C149.356221,162.768846 151.308063,161.884996 152.848916,159.689035 C154.108583,157.895569 155.254913,155.292428 157.398137,155.187802 C158.584855,155.129634 162.056295,158.072417 163.10825,156.053694 C164.07308,154.203231 161.993578,153.931908 161.181077,153.276828 C159.678802,152.06661 159.340419,153.270972 159.706723,151.14333 C160.792178,152.307873 162.495834,151.571982 162.95061,150.127527 C163.441226,148.569468 161.823998,148.10412 161.853937,147.113692 C161.842192,147.500572 162.687735,141.999153 162.554381,142.176001 C163.413669,141.041128 166.462257,141.392482 167.966582,141.555666 C170.263178,141.804346 170.13091,141.873446 171.222117,143.992109 C172.103838,145.707106 174.419542,149.169502 174.928748,144.633135 C175.050449,143.548232 174.059985,141.228907 173.478827,140.295477 C172.851533,139.287873 170.962455,138.651922 170.567003,137.868403 C169.622984,135.99803 172.731819,131.833707 172.206,129.014288 C173.298856,129.431618 176.063377,135.941423 177.404406,130.612948 C178.111059,127.812658 170.89879,121.667871 173.890225,120.718825 C176.178665,119.993084 178.501504,122.944066 179.140297,124.762907 C179.612624,126.110544 179.400215,129.001405 180.207508,130.116368 C183.243976,134.318949 183.618438,127.375418 183.364612,125.543693 C182.806036,121.517569 181.381252,118.556438 177.742225,117.034295 C179.037272,115.426656 177.396605,114.146948 176.467109,113.140514 C177.994834,111.484467 187.90383,113.244749 185.67495,108.813788 C185.137049,107.742159 183.193837,107.552037 182.208315,107.158911 C179.717195,106.166532 177.22313,104.1482 175.950562,101.597371 C177.79234,101.136708 183.230278,102.394554 182.515816,98.6011044 C181.952817,95.619282 177.112955,96.5335826 175.237767,96.9915137 C176.930155,95.9749301 180.211017,96.8166176 180.67198,94.0499017 C181.203002,90.8666365 177.383839,90.9736042 175.591269,91.6482034 C175.17003,88.2904324 181.122531,85.8176826 182.804663,83.2477249 C183.373237,82.3806618 184.275583,82.0835727 183.551013,80.6153042 C182.244616,77.9719526 178.870779,81.7013778 177.758771,82.7050785 C178.635221,81.0771393 181.079608,74.3018671 180.708517,72.5829664 C180.162561,70.057123 178.355898,69.967723 176.919931,72.0153348 C175.988608,73.3450137 175.729666,76.7176196 175.238294,78.4419859 C173.199533,76.9046179 173.095791,78.6883239 172.991008,76.2507095 C172.923099,74.6707886 174.992708,71.5499862 175.522623,70.0032488 C175.978715,68.6739603 177.190719,66.2433729 176.465593,64.9570277 C174.690293,61.8139729 172.993447,66.1289878 172.525841,67.608968 C171.737261,64.1977131 174.740084,61.5524095 175.629329,58.1778516 C176.170088,56.1298495 177.605245,50.5995409 175.118415,49.6165311 C171.724815,48.2755308 172.918922,54.5725714 172.440664,56.6162793 C172.07606,58.1758997 171.519076,60.6935447 170.302082,61.4622287 C170.125896,61.5734908 167.481496,61.8046035 167.354151,61.6554733 C165.620359,59.6336275 170.392027,55.207741 170.637754,53.3037939 C170.861461,51.5731813 170.198398,50.4792998 168.576831,50.3754553 C167.767833,50.323533 166.456472,51.5751333 166.081721,51.4935411 C164.602506,51.1718572 166.529338,44.4051737 166.669221,42.5269926 C166.819045,40.5238856 166.575417,35.355081 163.186097,37.7423348 C163.413049,35.0454993 163.549887,32.5063826 163.920134,29.8505384 C164.114962,28.45176 165.31836,27.2060156 163.546466,26.0840259 C161.389659,24.7192116 160.195301,27.5757179 159.703512,29.2516754 C158.858129,32.1374612 160.604934,36.6265913 156.546177,36.7183337 C151.880955,36.8237399 155.102123,31.9875502 155.331481,28.8503513 C155.459059,27.1091981 154.318536,22.4287754 152.06891,25.5866651 C151.173373,26.8456828 151.481865,31.2813291 150.985494,32.7702884 C149.878539,32.2772219 151.717562,28.2546115 150.755804,27.2056252 C148.695236,24.958913 146.966535,28.2315783 145.655991,28.8975889 C145.57044,27.4527441 145.468923,26.0067281 145.407913,24.5603216 C145.315305,22.3600662 146.663012,17.7307849 145.2945,16.2125461 C142.95772,13.6238495 141.471891,16.6443209 140.789049,18.7364375 C140.175628,20.6196938 140.091904,22.4795265 137.555716,22.7360147 C137.763741,20.0192692 135.29832,14.3004008 136.520803,12.0087933 C137.073558,10.9742516 138.200031,11.7078002 138.699701,10.5498943 C139.521287,8.64672801 138.176249,7.83939509 136.714154,7.77771298 C129.921887,7.49233563 135.152043,16.9117402 132.745372,19.2693241 C131.646423,18.2285361 132.817064,17.1557359 131.680174,15.6730229 C130.456777,14.0782671 128.507084,14.2133431 126.762486,14.9351799 C126.706116,13.3220757 129.125524,2.01512054 123.682122,7.11833905 C122.329503,8.38945896 122.708203,10.5112454 121.988704,12.004499 C121.293397,13.448563 119.599928,15.6019713 118.647561,16.7751026 C118.138071,14.7079712 118.919891,12.1450405 119.467423,10.1091405 C119.848493,8.69357518 122.399415,4.30399525 121.855094,2.8653967 C120.275192,-1.30204956 115.532497,5.5840942 114.282756,6.69671451 C112.701004,8.10642397 106.402711,12.7415612 104.381766,11.3369268 C103.680648,10.8501066 104.312204,9.04610014 103.355021,8.20948774 C102.885296,7.799575 100.877713,7.60828238 100.304676,7.66059506 C100.663044,6.16656069 99.9590183,4.23411488 98.2500992,4.75060494 C96.1010516,5.40060944 97.031157,8.58855944 95.6691727,9.75271164 C93.1402627,11.9174413 90.1353523,7.6410754 87.4245062,7.76092608 C87.8388134,6.00571874 90.9097688,-0.301081675 86.0261697,1.61691959 C84.7804466,2.10647253 83.8958015,4.9680539 83.5854252,6.15758165 C82.7941498,9.19327834 83.364323,9.74958849 80.0771587,10.6065013 C80.3338947,8.84621888 79.876509,6.65923677 80.7256589,5.08595261 C81.4218191,3.79726501 85.0314735,0.441445987 81.1879964,0.0233349851 C76.4475113,-0.492764683 76.9137424,7.69455926 76.3331882,10.4628367 C72.1267344,7.91396017 69.3589223,11.5606221 66.8533479,14.7153886 C67.3001674,13.2963097 68.4061862,-0.841776108 63.8882057,3.47753307 C62.5963925,4.71468878 64.0256621,6.54407081 63.9388761,7.95573223 C63.8604755,9.23622158 63.4388415,10.377731 62.9428241,11.5742858 C62.1474037,13.4950198 61.2224184,15.460649 59.9693808,17.0979577 C58.3962141,19.1568908 58.9543722,19.318904 57.1484939,17.9212967 C54.7243438,16.0478003 53.5723002,11.2974971 53.6920659,8.39570525 C53.781581,6.23526987 54.8879763,1.84842269 51.3078111,2.86461591 C47.8009276,3.86128948 49.6590375,10.8387852 50.0116201,13.3177814 C50.3931233,16.0052474 50.6468605,18.7543956 50.1948883,21.4906608 C47.2109167,18.4409099 46.7758614,24.7926055 46.1779169,25.8763368 C45.1988562,27.6534061 43.310101,28.5232019 41.8428337,29.7357629 C41.0431153,26.9417195 44.2482173,24.5790605 43.6123112,22.3561622 C42.4186453,18.1910583 39.0417626,24.0719399 38.2998862,25.2263323 C37.6814572,26.1886512 35.6651905,31.6682087 34.9351609,32.1593232 C33.9115906,32.848367 27.3301947,29.6315279 26.6642795,29.0186108 C25.4417603,27.8938883 25.8867201,24.7465391 24.3487748,24.0297774 C19.6293173,21.8322547 22.4173261,29.7638712 23.3441752,31.4035222 C25.7628153,35.687696 26.8597232,40.8604044 26.2928172,45.9077967 C25.4350389,45.6056325 24.378271,44.5964663 23.8253733,43.8305151 C22.7491426,42.3411654 23.1404237,39.9656235 22.017351,38.8436337 C18.7294809,35.5639414 18.3438318,41.7216116 18.6111593,43.6353185 C19.1118632,47.2226407 20.9020846,48.3856217 22.3890054,51.3693961 C23.7571524,54.1197154 21.943774,57.4376663 21.5613192,60.4944442 C18.1321771,57.1944514 3.36588279,59.9510171 7.16521769,64.996067 C9.14262534,67.628878 11.4834592,62.6185731 13.763287,62.7450604 C17.8464603,62.9714884 19.9981829,68.0411331 19.730271,71.5921487 C19.2330959,69.6940575 17.308498,67.8307112 15.9842104,70.148475 C15.0865685,71.7213688 16.6185854,74.4088349 17.3583008,75.9707976 C16.4523462,75.5265303 11.9860935,73.4504198 11.1123314,73.8095815 C7.67255627,75.2239756 12.4125819,77.9610216 13.6493116,78.5079623 C17.8734551,80.3759933 20.5363542,82.427509 21.8496116,87.4998864 C19.4819334,86.7425238 19.8941915,85.6220957 18.2972545,84.4567723 C16.830792,83.3870952 16.5566308,83.9387206 15.2071591,83.5889284 C12.8451619,82.9775728 9.76564295,82.1620417 7.09694168,83.2707581 C5.12707484,84.0898028 1.809527,86.5809011 1.19123199,88.9213077 C0.433581882,91.7946008 2.03522104,92.5273687 4.0949367,91.063785 C6.54565844,89.3249741 6.99233616,85.9593953 10.6783285,86.1030599 C12.4468385,86.1721595 14.198865,87.0989527 15.3182307,88.4286316 C16.1532654,89.4217916 16.6409799,90.859219 17.4378821,91.9242113 C18.1406712,92.8638875 20.0019971,94.1826354 20.3954288,95.1781378 C21.8129983,98.7732678 19.1191629,101.97332 17.3124291,104.492136 C16.8931801,103.937778 13.8353612,102.734196 13.2017458,102.613565 C10.2619363,102.05257 9.16499332,103.411918 11.003339,106.125931 C11.5823428,106.981673 12.8005957,107.342006 13.4385893,108.120059 C14.1501828,108.989074 14.5506213,110.319534 15.2570206,111.263504 C16.6502186,113.127241 18.3720966,114.086046 20.0353361,115.585546 C19.4216552,115.995069 19.4893606,114.962089 18.9332619,115.176024 C18.5290809,115.331791 17.8260425,115.020647 17.3157029,115.190078 C16.4875948,115.464915 16.5976214,116.907417 16.0678004,117.11862 C12.7691062,118.433464 9.44069672,113.504361 6.48191847,113.343909 C4.86832034,113.256461 3.50714906,114.33785 4.28187338,116.365942 C4.82030298,117.777604 7.1521321,118.543555 8.31806645,119.133048 C11.5636759,120.776994 14.7956022,122.001266 18.2658233,120.739516 C21.0634173,123.177911 24.4247131,124.380712 27.9404633,124.415457 C25.9286815,125.412912 23.9404919,126.650458 23.2377959,129.136091 C22.0492883,127.906352 19.1297602,122.18397 17.6048295,126.674272 C16.5600021,129.760719 21.328009,133.54519 23.5253695,134.93577 C20.9696368,135.690791 18.8477815,135.842653 16.2480678,135.542832 C14.8906605,135.386674 11.9114372,133.569004 13.0097195,137.290621 C14.1918233,141.306595 21.2508358,139.501808 23.4900552,138.806518 C23.573221,137.609182 12.720439,150.91495 20.3316507,148.295803 C22.5082405,147.54781 22.7169752,143.295258 25.7496614,142.923213 C29.2527527,142.493 29.604919,146.000291 31.6318019,148.569078 C32.6420388,149.851129 37.301235,152.734182 37.0806939,153.833919 C36.8900419,154.785698 34.3317238,155.329905 33.7876434,156.661927 C33.1549566,158.211397 33.4406255,159.407952 34.3203529,160.740363 C35.8579788,163.072962 38.6803216,163.431343 40.9122645,164.344472 C44.0760798,165.639406 45.222862,167.210738 46.6413081,170.561482 C44.1404008,170.681333 37.0221866,177.920783 41.3837473,179.20908 C43.008912,179.689263 42.7562908,178.242857 43.4326768,177.443722 C43.7062927,176.928403 43.9803807,176.413865 44.2542196,175.898937 C44.712395,174.701211 45.2188422,174.627817 45.7732734,175.678365 C45.8972683,175.647914 47.3835007,176.067196 47.7210266,176.087887 C49.4285338,176.192512 50.5714284,174.896017 51.9872076,174.195261 C53.0103456,173.688921 54.0114437,173.77676 54.7822568,172.609485 C54.6931475,172.74417 55.3356677,170.098476 55.3468697,170.07271 C55.6226004,169.435623 56.3317095,169.525891 56.6573761,168.839152 C47.908417,159.753669 42.1996805,147.719969 41.1683996,134.375285 C36.4198742,132.776426 33,128.28759 33,123 L33,110 C33,104.965228 36.1006595,100.654655 40.4966083,98.8736491 C41.0282518,99.2483349 41.7670825,98.8748923 42,98.0318338 C41.5372601,96.526107 45.2959449,70.1780326 55,63.1563695 C58.618222,60.7183684 78.0082164,60.5372207 97.3126144,60.5504522 C116.408606,60.5635409 135.42084,60.7446886 139,63.1563695 C148.704055,70.1780326 152.46274,96.526107 152,98.0318338 C152.232917,98.8748923 152.971748,99.2483349 153.503392,98.8736491 Z', id: path3 })),
+            React.createElement("mask", { id: mask2, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Short-Hair/Dreads-02', mask: "url(#" + mask2 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement(facialHair_1.default, null),
+                    React.createElement("g", { id: 'Hair', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(36.000000, 0.000000)' },
+                        React.createElement("mask", { id: mask1, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path3 })),
+                        React.createElement("use", { id: 'Dreads', fill: '#2E3257', xlinkHref: '#' + path3 }),
+                        React.createElement(HairColor_1.default, { maskID: mask1 })),
+                    this.props.children))));
+    };
+    ShortHairDreads02.optionValue = 'ShortHairDreads02';
+    return ShortHairDreads02;
+}(React.Component));
+exports.default = ShortHairDreads02;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairFrizzle.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairFrizzle.d.ts
new file mode 100644
index 000000000..27d85cf7a
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairFrizzle.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class ShortHairFrizzle extends React.Component {
+    static optionValue: string;
+    private filter1;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairFrizzle.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairFrizzle.js
new file mode 100644
index 000000000..597181a52
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairFrizzle.js
@@ -0,0 +1,58 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var ShortHairFrizzle = /** @class */ (function (_super) {
+    __extends(ShortHairFrizzle, _super);
+    function ShortHairFrizzle() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    ShortHairFrizzle.prototype.render = function () {
+        var _a = this, filter1 = _a.filter1, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path2, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M90.9102919,55.3613196 L175.085702,55.3613196 C193.333279,44.8338001 196.759397,26.1510357 183.849606,9.92600089 C180.635746,5.88682054 175.085702,21.6755614 158.028596,22.6504878 C140.97149,23.6254143 142.608865,16.3498661 124.45759,19.0739248 C106.306316,21.7979835 108.311575,36.37843 96.4671989,39.8768239 C88.5709482,42.2090865 86.7186458,47.370585 90.9102919,55.3613196 Z', id: path1 }),
+                React.createElement("filter", { x: '-0.8%', y: '-2.0%', width: '101.5%', height: '108.0%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' })))),
+            React.createElement("mask", { id: mask2, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path2 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Short-Hair/Frizzle', mask: "url(#" + mask2 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement(facialHair_1.default, null),
+                    React.createElement("mask", { id: mask1, fill: 'white' },
+                        React.createElement("use", { xlinkHref: '#' + path1 })),
+                    React.createElement("use", { id: 'Hair-Maks', stroke: 'none', fill: '#252E32', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+                    React.createElement(HairColor_1.default, { maskID: mask1 }),
+                    this.props.children))));
+    };
+    ShortHairFrizzle.optionValue = 'ShortHairFrizzle';
+    return ShortHairFrizzle;
+}(React.Component));
+exports.default = ShortHairFrizzle;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShaggy.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShaggy.d.ts
new file mode 100644
index 000000000..ac2284513
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShaggy.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class ShortHairShaggy extends React.Component {
+    static optionValue: string;
+    private filter1;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShaggy.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShaggy.js
new file mode 100644
index 000000000..9ef0cc563
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShaggy.js
@@ -0,0 +1,58 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var ShortHairShaggy = /** @class */ (function (_super) {
+    __extends(ShortHairShaggy, _super);
+    function ShortHairShaggy() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    ShortHairShaggy.prototype.render = function () {
+        var _a = this, filter1 = _a.filter1, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path2, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("filter", { x: '-0.8%', y: '-2.0%', width: '101.5%', height: '108.0%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' }))),
+                React.createElement("path", { d: 'M198.74696,37.856181 C193.606255,34.0244119 187.528383,30.7396605 181.187893,29.4782789 C174.741035,28.1960616 170.829392,27.8846292 164.483286,29.4052984 C162.85043,29.796545 162.299428,30.1854765 160.862131,29.2568033 C159.651446,28.4743102 151.200134,19.7668788 125.441738,24.5998777 C99.4069464,29.4847361 91.6728211,68.675365 82.0154166,70.1662691 C78.5349852,70.703365 74.2336661,69.781637 74.0992189,67.6388757 C70.1355043,73.6726057 69.0913088,81.6460323 70.7717335,88.7129442 C72.2186099,94.7989286 75.2686121,100.517478 80.7607964,103.849523 C85.4865987,106.716901 92.0203357,107.966046 97.4817987,107.437218 C99.9669245,107.196782 102.227091,106.673576 104.513684,105.671152 C107.272659,104.461694 109.470722,102.280238 112.177835,101.127995 C109.351471,103.576015 106.275372,105.735312 103.001731,107.546357 C101.362599,108.452872 99.6980301,109.07761 97.8887739,109.570058 C96.6533133,109.906073 94.127556,111.05104 92.9327267,110.752066 C100.740244,112.148383 108.093217,110.931649 115.252282,107.589351 C118.483309,106.08125 121.59079,104.256976 124.44325,102.112561 C127.276221,99.9826977 130.537639,97.8062025 132.753871,95.0036468 C131.823641,96.2071517 133.450882,94.4169423 133.665931,94.1980029 C134.274082,93.578226 134.869349,92.9458816 135.453055,92.302954 C136.455298,91.1993278 137.450603,90.0751967 138.383805,88.9120401 C140.37772,86.426318 142.234875,83.8298033 143.891185,81.1086057 C145.568637,78.352682 152.249704,67.2357231 154.266412,64.6190342 C152.361358,70.327001 150.286511,76.0372828 147.858864,81.5445 C152.572444,80.0744315 157.142657,76.0002417 160.15401,72.2035294 C163.545911,67.9275978 165.554691,62.9359795 166.262273,57.5379012 C170.087576,67.953725 179.047309,76.1675881 188.294435,81.8328914 C186.29094,78.1026546 183.238626,74.9478777 181.242068,71.1548033 C190.433037,80.4838679 205.809898,85.0481908 209.837367,98.7289227 C210.869671,93.9714569 214.189889,90.1482867 215.184533,85.2955724 C216.28885,79.9070851 217.081329,74.1868816 216.90592,68.6796644 C216.508524,56.4379129 208.273882,44.9574883 198.74696,37.856181 Z', id: path1 })),
+            React.createElement("mask", { id: mask2, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path2 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Short-Hair/Shaggy', mask: "url(#" + mask2 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement(facialHair_1.default, null),
+                    this.props.children,
+                    React.createElement("mask", { id: mask1, fill: 'white' },
+                        React.createElement("use", { xlinkHref: '#' + path1, transform: 'scale(-1, 1)' })),
+                    React.createElement("use", { id: 'Shaggy-Hair', stroke: 'none', fill: '#28354B', fillRule: 'evenodd', transform: 'translate(143.465161, 67.234158) scale(-1, 1) translate(-143.465161, -67.234158) ', xlinkHref: '#' + path1 }),
+                    React.createElement(HairColor_1.default, { maskID: mask1 })))));
+    };
+    ShortHairShaggy.optionValue = 'ShortHairShaggy';
+    return ShortHairShaggy;
+}(React.Component));
+exports.default = ShortHairShaggy;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShaggyMullet.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShaggyMullet.d.ts
new file mode 100644
index 000000000..586c8aed2
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShaggyMullet.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class ShortHairShaggyMullet extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    private path3;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShaggyMullet.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShaggyMullet.js
new file mode 100644
index 000000000..8ce7d5a6b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShaggyMullet.js
@@ -0,0 +1,54 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var ShortHairShaggyMullet = /** @class */ (function (_super) {
+    __extends(ShortHairShaggyMullet, _super);
+    function ShortHairShaggyMullet() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.path3 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    ShortHairShaggyMullet.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2, path3 = _a.path3;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M175.126419,166.897818 C175.841424,169.13759 176.874789,171.230601 178.55519,172.685954 C180.17619,174.090053 183.068114,173.745469 185.098621,173.802748 C186.770693,173.850632 188.444623,173.856087 190.114529,173.783655 C190.95366,173.747287 191.327571,174.79771 190.648775,175.281705 C190.518773,175.374442 190.388771,175.462634 190.25846,175.543856 C189.20761,176.198779 188.11838,176.802787 187.008721,177.356184 C184.485135,178.614206 181.821334,179.600077 179.02722,180.090436 C177.110792,180.426519 175.211229,180.489668 173.372596,180.266511 C173.858877,180.986862 174.419563,181.642356 175.071506,182.207788 C176.801481,183.708407 179.887821,183.340135 182.054832,183.401352 C183.839313,183.452528 185.625776,183.458358 187.407944,183.380946 C188.303488,183.342078 188.702535,184.464709 187.978106,184.981974 C187.839364,185.081086 187.700623,185.175341 187.561551,185.262145 C186.440057,185.962089 185.2776,186.607617 184.093342,187.199055 C181.400104,188.543555 178.557223,189.597195 175.57527,190.121262 C170.075488,191.087126 164.705859,189.943766 160.380755,186.413279 C159.16361,185.419765 158.027363,184.287616 157,183.053001 L157,180.610951 C163.949635,177.309539 170.111406,172.618864 175.126419,166.897818 Z M81.3150549,151.593977 C80.572738,153.13892 79.8051751,154.672522 79.0058562,156.190972 C74.2106831,165.300379 68.2421528,176.792949 56.4993303,177.596328 C55.4105393,177.670743 54.9804404,178.942941 55.8287461,179.588187 C66.9485528,188.041497 92.2609618,193.18734 101.273548,191.569729 C104.095212,191.063278 106.638877,190.402091 109,189.610443 L109,180.610951 C96.5625107,174.702544 86.6484598,164.344483 81.3150549,151.593977 Z M195.90592,68.6796644 C196.081329,74.1868816 195.28885,79.9070851 194.184533,85.2955724 C193.189889,90.1482867 189.869671,93.9714569 188.837367,98.7289227 C184.809898,85.0481908 169.433037,80.4838679 160.242068,71.1548033 C162.238626,74.9478777 165.29094,78.1026546 167.294435,81.8328914 C158.047309,76.1675881 149.087576,67.953725 145.262273,57.5379012 C144.554691,62.9359795 142.545911,67.9275978 139.15401,72.2035294 C136.142657,76.0002417 131.572444,80.0744315 126.858864,81.5445 C129.286511,76.0372828 131.361358,70.327001 133.266412,64.6190342 C131.249704,67.2357231 124.568637,78.352682 122.891185,81.1086057 C121.234875,83.8298033 119.37772,86.426318 117.383805,88.9120401 C116.450603,90.0751967 115.455298,91.1993278 114.453055,92.302954 C113.869349,92.9458816 113.274082,93.578226 112.665931,94.1980029 C112.450882,94.4169423 110.823641,96.2071517 111.753871,95.0036468 C109.537639,97.8062025 106.276221,99.9826977 103.44325,102.112561 C100.59079,104.256976 97.4833088,106.08125 94.2522818,107.589351 C87.0932166,110.931649 79.7402436,112.148383 71.9327267,110.752066 C73.127556,111.05104 75.6533133,109.906073 76.8887739,109.570058 C78.6980301,109.07761 80.3625987,108.452872 82.0017312,107.546357 C85.2753717,105.735312 88.3514706,103.576015 91.1778346,101.127995 C88.4707222,102.280238 86.2726593,104.461694 83.513684,105.671152 C81.2270908,106.673576 78.9669245,107.196782 76.4817987,107.437218 C71.0203357,107.966046 64.4865987,106.716901 59.7607964,103.849523 C54.2686121,100.517478 51.2186099,94.7989286 49.7717335,88.7129442 C48.0913088,81.6460323 49.1355043,73.6726057 53.0992189,67.6388757 C53.2336661,69.781637 57.5349852,70.703365 61.0154166,70.1662691 C70.6728211,68.675365 76.4180436,32.1184491 101.441738,25.5998777 C121.403017,20.3995724 135.651446,29.4743102 136.862131,30.2568033 C138.299428,31.1854765 138.85043,30.796545 140.483286,30.4052984 C146.829392,28.8846292 153.741035,28.1960616 160.187893,29.4782789 C166.528383,30.7396605 172.606255,34.0244119 177.74696,37.856181 C187.273882,44.9574883 195.508524,56.4379129 195.90592,68.6796644 Z', id: path2 }),
+                React.createElement("path", { d: 'M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z', id: path3 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Short-Hair/Shaggy-Mullet', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    this.props.children,
+                    React.createElement("mask", { id: mask2, fill: 'white' },
+                        React.createElement("use", { xlinkHref: '#' + path2 })),
+                    React.createElement("use", { id: 'Hair', stroke: 'none', fill: '#1D2633', fillRule: 'evenodd', xlinkHref: '#' + path2 }),
+                    React.createElement(HairColor_1.default, { maskID: mask2 }),
+                    React.createElement("path", { d: 'M175.126419,166.897818 C175.841424,169.13759 176.874789,171.230601 178.55519,172.685954 C180.17619,174.090053 183.068114,173.745469 185.098621,173.802748 C186.770693,173.850632 188.444623,173.856087 190.114529,173.783655 C190.95366,173.747287 191.327571,174.79771 190.648775,175.281705 C190.518773,175.374442 190.388771,175.462634 190.25846,175.543856 C189.20761,176.198779 188.11838,176.802787 187.008721,177.356184 C184.485135,178.614206 181.821334,179.600077 179.02722,180.090436 C177.110792,180.426519 175.211229,180.489668 173.372596,180.266511 C173.858877,180.986862 174.419563,181.642356 175.071506,182.207788 C176.801481,183.708407 179.887821,183.340135 182.054832,183.401352 C183.839313,183.452528 185.625776,183.458358 187.407944,183.380946 C188.303488,183.342078 188.702535,184.464709 187.978106,184.981974 C187.839364,185.081086 187.700623,185.175341 187.561551,185.262145 C186.440057,185.962089 185.2776,186.607617 184.093342,187.199055 C181.400104,188.543555 178.557223,189.597195 175.57527,190.121262 C170.075488,191.087126 164.705859,189.943766 160.380755,186.413279 C159.16361,185.419765 158.027363,184.287616 157,183.053001 L157,180.610951 C163.949635,177.309539 170.111406,172.618864 175.126419,166.897818 Z M81.3150549,151.593977 C80.572738,153.13892 79.8051751,154.672522 79.0058562,156.190972 C74.2106831,165.300379 68.2421528,176.792949 56.4993303,177.596328 C55.4105393,177.670743 54.9804404,178.942941 55.8287461,179.588187 C66.9485528,188.041497 92.2609618,193.18734 101.273548,191.569729 C104.095212,191.063278 106.638877,190.402091 109,189.610443 L109,180.610951 C96.5625107,174.702544 86.6484598,164.344483 81.3150549,151.593977 Z', id: 'Shadow', stroke: 'none', fillOpacity: '0.16', fill: '#000000', fillRule: 'evenodd' }),
+                    React.createElement(facialHair_1.default, null)))));
+    };
+    ShortHairShaggyMullet.optionValue = 'ShortHairShaggyMullet';
+    return ShortHairShaggyMullet;
+}(React.Component));
+exports.default = ShortHairShaggyMullet;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortCurly.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortCurly.d.ts
new file mode 100644
index 000000000..8bd440866
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortCurly.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class ShortHairShortCurly extends React.Component {
+    static optionValue: string;
+    private filter1;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortCurly.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortCurly.js
new file mode 100644
index 000000000..df366acee
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortCurly.js
@@ -0,0 +1,58 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var ShortHairShortCurly = /** @class */ (function (_super) {
+    __extends(ShortHairShortCurly, _super);
+    function ShortHairShortCurly() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    ShortHairShortCurly.prototype.render = function () {
+        var _a = this, filter1 = _a.filter1, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path2, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M94.2519269,52.0221149 C94.3749353,51.9677149 94.0696712,51.9468149 93.3361345,51.9595149 C94.2276637,51.9577149 94.5329279,51.9785149 94.2519269,52.0221149 M86.1169775,36.3015924 C86.1148422,36.2819924 86.1337548,36.4526924 86.1169775,36.3015924 M193.765056,70.7656665 C193.500946,67.448734 193.03295,64.1518864 192.246676,60.9110823 C191.622233,58.3353492 190.769007,55.8775343 189.760006,53.4200433 C189.150703,51.9353766 187.727538,49.8961062 187.560324,48.2944933 C187.395466,46.7168527 188.626521,44.969138 188.889285,43.1323368 C189.144311,41.3447761 189.100909,39.4652134 188.734183,37.6938503 C187.901144,33.6710288 185.140271,29.9300447 180.877167,28.8814158 C179.925362,28.6471994 177.913417,28.9358396 177.240862,28.3815597 C176.469729,27.7459682 175.932761,25.5806808 175.234637,24.7121687 C173.244224,22.2362125 170.13984,20.6417265 166.865887,21.1976261 C164.454917,21.606776 165.839391,22.1053363 164.032005,20.6864317 C163.027041,19.8976114 162.276095,18.6931622 161.300066,17.8392279 C159.832826,16.5563826 158.149588,15.4581893 156.408146,14.556958 C151.851325,12.19892 146.654249,10.4848961 141.564162,9.64942693 C132.278934,8.12523827 122.368926,9.45408458 113.368668,11.8688141 C108.890239,13.0703477 104.381531,14.5951842 100.222053,16.6117782 C98.4385542,17.4764029 97.4090304,18.1936301 95.5494951,18.4200717 C92.6207355,18.7767416 90.1404579,18.7589243 87.3661268,20.0009517 C78.8298269,23.8229236 74.9849256,32.6897818 78.3066539,41.1750259 C78.974835,42.8815988 79.8795374,44.3801954 81.1267416,45.7586062 C82.6474761,47.4392631 83.1975648,47.1085093 81.8877817,49.0411999 C79.9289949,51.9311653 78.2777195,55.0129095 76.9332826,58.2128958 C73.4043038,66.6145606 72.8138416,76.0771643 73.043634,85.0373203 C73.1240445,88.1741362 73.2586228,91.3495022 73.753198,94.4561907 C73.966841,95.8009106 74.0267283,98.3293468 75.0353925,99.3271154 C75.5471264,99.8331265 76.2762042,100.115288 77.0035997,99.9137903 C78.7130802,99.4401742 78.1253096,98.1787097 78.1650102,97.0076274 C78.364859,91.1240324 78.0950295,85.9191145 79.4943071,80.1064647 C80.5278683,75.8118486 82.2504702,71.9114806 84.4827873,68.0713675 C87.3213795,63.1871608 90.3857268,58.8977279 94.2895061,54.7155226 C95.2073299,53.7320079 95.4078515,53.3150832 96.6385698,53.243814 C97.5705244,53.1900382 98.9338023,53.8282213 99.8398505,54.0491558 C101.837665,54.5360539 103.83918,55.0174448 105.873331,55.3452831 C109.613261,55.9481556 113.316519,55.9886494 117.090094,55.8704074 C124.516459,55.6381346 131.974787,55.1172217 139.175061,53.2470535 C143.956964,52.00535 148.196516,49.7762443 152.776887,48.1422364 C152.858644,48.1130808 154.006596,47.2951049 154.207791,47.3284719 C154.488723,47.3747968 156.184746,49.1542588 156.471061,49.3784327 C158.696649,51.1238798 161.137899,51.8566566 163.541467,53.2081794 C166.504881,54.8745825 163.634999,52.4899804 165.269452,54.5668292 C165.745859,55.1716454 165.989782,56.2931632 166.371984,56.9783192 C167.587899,59.1610999 169.279548,61.0795367 171.302932,62.6017816 C173.258018,64.0725184 176.196198,64.7829426 177.193087,66.697168 C177.961865,68.1740599 178.220929,70.1812592 178.841334,71.7579279 C180.468722,75.8931602 182.617937,79.7494709 184.767152,83.6443317 C186.498502,86.7830913 188.392354,89.5250111 188.584801,93.1117947 C188.651754,94.3603012 187.463764,101.849397 190.357534,99.5716982 C190.786502,99.2341415 191.711391,95.415733 191.901483,94.7678314 C192.672616,92.135083 192.94682,89.3866841 193.29605,86.6816947 C193.990474,81.3021672 194.218584,76.1837441 193.765056,70.7656665', id: path1 }),
+                React.createElement("filter", { x: '-0.8%', y: '-2.0%', width: '101.5%', height: '108.0%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' })))),
+            React.createElement("mask", { id: mask2, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path2 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Short-Hair/Short-Curly', mask: "url(#" + mask2 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement(facialHair_1.default, null),
+                    React.createElement("mask", { id: mask1, fill: 'white' },
+                        React.createElement("use", { xlinkHref: '#' + path1 })),
+                    React.createElement("use", { id: 'Short-Hair', stroke: 'none', fill: '#28354B', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+                    React.createElement(HairColor_1.default, { maskID: mask1 }),
+                    this.props.children))));
+    };
+    ShortHairShortCurly.optionValue = 'ShortHairShortCurly';
+    return ShortHairShortCurly;
+}(React.Component));
+exports.default = ShortHairShortCurly;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortFlat.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortFlat.d.ts
new file mode 100644
index 000000000..64e2442df
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortFlat.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class ShortHairShortFlat extends React.Component {
+    static optionValue: string;
+    private filter1;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortFlat.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortFlat.js
new file mode 100644
index 000000000..5b07eb1cf
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortFlat.js
@@ -0,0 +1,58 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var ShortHairShortFlat = /** @class */ (function (_super) {
+    __extends(ShortHairShortFlat, _super);
+    function ShortHairShortFlat() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    ShortHairShortFlat.prototype.render = function () {
+        var _a = this, filter1 = _a.filter1, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path2, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M180.14998,39.9204083 C177.390206,37.1003988 174.185913,34.7068297 171.069252,32.3065503 C170.381566,31.777442 169.682843,31.2610833 169.010544,30.7118441 C168.857687,30.5870323 167.291999,29.4657388 167.104691,29.0530544 C166.653816,28.0602634 166.915042,28.8332916 166.977255,27.6485857 C167.055857,26.150508 170.11064,21.9193194 167.831176,20.9490079 C166.828413,20.522232 165.039628,21.6579526 164.077671,22.0330592 C162.196235,22.7671676 160.291721,23.3932399 158.346734,23.9330847 C159.278588,22.0763407 161.055333,18.3594977 157.71591,19.3543018 C155.114345,20.1293431 152.690052,22.1219709 150.075777,23.0594018 C150.940735,21.6415124 154.399901,17.2479341 151.274209,17.0023366 C150.301549,16.925839 147.471201,18.7503735 146.423952,19.1395717 C143.287223,20.3054888 140.083264,21.0590571 136.789999,21.6525844 C125.59203,23.6707114 112.497238,23.0953019 102.1368,28.1934632 C94.1494796,32.1236942 86.262502,38.2220278 81.648386,45.987539 C77.2011742,53.472559 75.537818,61.6641751 74.6069673,70.2412987 C73.9239644,76.535909 73.8684412,83.0425652 74.1878671,89.3599905 C74.2922241,91.4297869 74.5250203,100.970847 77.5319724,98.0813859 C79.0300967,96.641688 79.019059,90.8282073 79.3963495,88.8604076 C80.1472513,84.9452748 80.870057,81.0126951 82.122006,77.2227096 C84.3282191,70.5439339 86.9307879,63.4296587 92.4269209,58.8297383 C95.9539853,55.8782066 98.4307906,51.8889248 101.806002,48.9112229 C103.322188,47.5738572 102.165231,47.7130963 104.602902,47.888571 C106.240504,48.006337 107.885464,48.0512961 109.52641,48.0942421 C113.322394,48.1928837 117.124399,48.16772 120.921387,48.1811407 C128.56821,48.208653 136.179243,48.316689 143.818708,47.9164188 C147.213653,47.7385955 150.617965,47.6423024 154.00388,47.3282597 C155.895349,47.152785 159.251496,45.9405668 160.808488,46.8669256 C162.233362,47.7144383 163.71309,50.4817719 164.736257,51.615144 C167.153525,54.2935659 170.035717,56.3392052 172.862385,58.5354911 C178.756547,63.114945 181.732392,68.8666908 183.522515,76.023241 C185.305949,83.1532854 184.805905,89.76815 187.013456,96.78479 C187.401784,98.0184813 188.428965,100.14498 189.695296,98.2389151 C189.930434,97.8849461 189.869559,95.9390277 189.869559,94.819339 C189.869559,90.2995934 191.014141,86.9083772 190.999758,82.3591197 C190.943566,68.5271489 190.49637,50.4908308 180.14998,39.9204083 Z', id: path1 }),
+                React.createElement("filter", { x: '-0.8%', y: '-2.0%', width: '101.5%', height: '108.0%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' })))),
+            React.createElement("mask", { id: mask2, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path2 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Short-Hair/Short-Flat', mask: "url(#" + mask2 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement(facialHair_1.default, null),
+                    React.createElement("mask", { id: mask1, fill: 'white' },
+                        React.createElement("use", { xlinkHref: '#' + path1 })),
+                    React.createElement("use", { id: 'Short-Hair', stroke: 'none', fill: '#1F3140', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+                    React.createElement(HairColor_1.default, { maskID: mask1 }),
+                    this.props.children))));
+    };
+    ShortHairShortFlat.optionValue = 'ShortHairShortFlat';
+    return ShortHairShortFlat;
+}(React.Component));
+exports.default = ShortHairShortFlat;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortRound.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortRound.d.ts
new file mode 100644
index 000000000..e9679f78c
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortRound.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class ShortHairShortRound extends React.Component {
+    static optionValue: string;
+    private filter1;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortRound.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortRound.js
new file mode 100644
index 000000000..5b7be88d5
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortRound.js
@@ -0,0 +1,58 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var ShortHairShortRound = /** @class */ (function (_super) {
+    __extends(ShortHairShortRound, _super);
+    function ShortHairShortRound() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    ShortHairShortRound.prototype.render = function () {
+        var _a = this, filter1 = _a.filter1, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path2, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M167.308863,35.006118 C147.121091,23.3065109 127.128954,25.2219854 112.036894,29.0299707 C96.9448338,32.8379559 88.0168242,43.6513048 80.3566792,59.6480618 C76.5956048,67.5028569 74.3660182,76.7914798 74.0230569,85.4813651 C73.8884429,88.8932666 74.3484305,92.415154 75.267729,95.7003546 C75.6049405,96.9061873 77.4232441,101.086987 77.9224658,97.70885 C78.0885348,96.584253 77.4804043,95.0327505 77.4215529,93.8376154 C77.3444374,92.2693977 77.4273028,90.6807875 77.5341822,89.1149098 C77.7340739,86.1874141 78.2559568,83.3154127 79.1847257,80.524647 C80.5119249,76.5367405 82.2013644,72.212859 84.7874413,68.8480942 C91.1883705,60.5205939 102.268658,60.045883 111.066257,55.4635848 C110.302881,56.8686624 107.359637,59.1432635 108.379389,60.7268592 C109.083576,61.8207003 111.749474,61.4890712 113.022219,61.4539693 C116.370996,61.3623702 119.734993,60.7796791 123.042844,60.306974 C128.255923,59.5618115 133.140585,58.0517626 138.046555,56.2181078 C142.06299,54.7164165 146.650012,53.3257139 149.66868,50.1404701 C154.539813,55.1881187 160.809849,59.9345599 167.070414,63.1428706 C172.68835,66.0222267 181.748751,67.461069 185.182761,73.3006826 C189.2479,80.2147477 187.37751,88.7073939 188.619138,96.2008069 C189.091302,99.05041 190.164155,98.986558 190.751315,96.4378281 C191.748406,92.1082634 192.219217,87.6102098 191.901961,83.1592929 C191.183568,73.1114668 187.496636,46.7057251 167.308863,35.006118 Z', id: path1 }),
+                React.createElement("filter", { x: '-0.8%', y: '-2.0%', width: '101.5%', height: '108.0%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' })))),
+            React.createElement("mask", { id: mask2, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path2 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Short-Hair/Short-Round', mask: "url(#" + mask2 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement(facialHair_1.default, null),
+                    React.createElement("mask", { id: mask1, fill: 'white' },
+                        React.createElement("use", { xlinkHref: '#' + path1 })),
+                    React.createElement("use", { id: 'Short-Hair', stroke: 'none', fill: '#28354B', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+                    React.createElement(HairColor_1.default, { maskID: mask1 }),
+                    this.props.children))));
+    };
+    ShortHairShortRound.optionValue = 'ShortHairShortRound';
+    return ShortHairShortRound;
+}(React.Component));
+exports.default = ShortHairShortRound;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortWaved.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortWaved.d.ts
new file mode 100644
index 000000000..52aaebc88
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortWaved.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class ShortHairShortWaved extends React.Component {
+    static optionValue: string;
+    private filter1;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortWaved.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortWaved.js
new file mode 100644
index 000000000..056740d0a
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairShortWaved.js
@@ -0,0 +1,58 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var ShortHairShortWaved = /** @class */ (function (_super) {
+    __extends(ShortHairShortWaved, _super);
+    function ShortHairShortWaved() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    ShortHairShortWaved.prototype.render = function () {
+        var _a = this, filter1 = _a.filter1, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path2, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M183.679824,38.9488198 C189.086072,33.9985622 190.387393,23.9615454 187.317704,17.4493246 C183.549263,9.45385312 175.901319,8.45217737 168.572342,11.9686703 C161.664469,15.2835661 155.515175,16.3878671 147.950196,14.7817319 C140.691624,13.2406923 133.805566,10.5226172 126.303388,10.0762471 C113.978028,9.34292483 102.003367,13.914565 93.6031232,23.1292512 C92.0003538,24.8871655 90.7089493,26.8971594 89.4882796,28.9343872 C88.5115454,30.5644351 87.4105298,32.3133822 86.9950459,34.1921885 C86.7973853,35.0855929 87.165272,37.2898774 86.7203704,38.0218712 C86.2391099,38.8123183 84.4244668,39.5373375 83.6510124,40.1238625 C82.0842713,41.3125222 80.7267597,42.6539573 79.4713836,44.1710842 C76.8052796,47.3926541 75.3376994,50.7577001 74.1034777,54.7428152 C70.0005333,67.9877849 69.6528094,83.7412616 74.9569218,96.7467724 C75.6639385,98.4811062 77.8550622,102.098564 79.1431613,98.3847912 C79.3976741,97.6508047 78.8086588,95.1907873 78.8099809,94.4501584 C78.8146084,91.7300906 80.3160587,73.7213568 86.857084,63.6330196 C88.9862338,60.3491948 98.8298903,48.0522456 100.840541,47.9536058 C101.9058,49.6464245 112.720532,60.4624529 140.783385,59.1948919 C153.445253,58.6229725 163.18265,52.9341181 165.520833,50.4680909 C166.549375,56.0008881 178.51323,64.2839965 180.33625,67.6921976 C185.602529,77.5376948 186.770677,97.9957204 188.780988,97.9573368 C190.791299,97.9189532 192.234429,92.7197798 192.647929,91.7270713 C195.719601,84.351669 196.242509,75.0948338 195.914948,67.1684434 C195.487565,56.9663626 191.276535,45.9419513 183.679824,38.9488198 Z', id: path1 }),
+                React.createElement("filter", { x: '-0.8%', y: '-2.0%', width: '101.5%', height: '108.0%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' })))),
+            React.createElement("mask", { id: mask2, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path2 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Short-Hair/Short-Waved', mask: "url(#" + mask2 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement(facialHair_1.default, null),
+                    React.createElement("mask", { id: mask1, fill: 'white' },
+                        React.createElement("use", { xlinkHref: '#' + path1 })),
+                    React.createElement("use", { id: 'Short-Hair', stroke: 'none', fill: '#28354B', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+                    React.createElement(HairColor_1.default, { maskID: mask1 }),
+                    this.props.children))));
+    };
+    ShortHairShortWaved.optionValue = 'ShortHairShortWaved';
+    return ShortHairShortWaved;
+}(React.Component));
+exports.default = ShortHairShortWaved;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairSides.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairSides.d.ts
new file mode 100644
index 000000000..04d1e5c63
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairSides.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class ShortHairSides extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    private path3;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairSides.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairSides.js
new file mode 100644
index 000000000..acbe1ca5d
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairSides.js
@@ -0,0 +1,54 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var ShortHairSides = /** @class */ (function (_super) {
+    __extends(ShortHairSides, _super);
+    function ShortHairSides() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.path3 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    ShortHairSides.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2, path3 = _a.path3;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z', id: path2 }),
+                React.createElement("path", { d: 'M6,28 C0.923687084,28.0709555 0,26.9937684 0,23 C1.30010922e-16,17.3439836 4.0408529,6.77808536 8,2 C9.17612094,-0.170695788 11.6189856,-1.43187215 11,3 C8.3404922,11.4766099 11.4173429,27.914487 6,28 Z M120,28 C114.582657,27.914487 117.659508,11.4766099 115,3 C114.381014,-1.43187215 116.823879,-0.170695788 118,2 C121.959147,6.77808536 126,17.3439836 126,23 C126,26.9937684 125.076313,28.0709555 120,28 Z', id: path3 })),
+            React.createElement("mask", { id: mask2, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Short-Hair/Sides', mask: "url(#" + mask2 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement(facialHair_1.default, null),
+                    React.createElement("g", { id: 'Hair', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(70.000000, 74.000000)' },
+                        React.createElement("mask", { id: mask1, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path3 })),
+                        React.createElement("use", { id: 'Sides', fill: '#9E7A7A', xlinkHref: '#' + path3 }),
+                        React.createElement(HairColor_1.default, { maskID: mask1 })),
+                    this.props.children))));
+    };
+    ShortHairSides.optionValue = 'ShortHairSides';
+    return ShortHairSides;
+}(React.Component));
+exports.default = ShortHairSides;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairTheCaesar.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairTheCaesar.d.ts
new file mode 100644
index 000000000..f51754a15
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairTheCaesar.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class ShortHairTheCaesar extends React.Component {
+    static optionValue: string;
+    private filter1;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairTheCaesar.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairTheCaesar.js
new file mode 100644
index 000000000..1f9792b27
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairTheCaesar.js
@@ -0,0 +1,59 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var ShortHairTheCaesar = /** @class */ (function (_super) {
+    __extends(ShortHairTheCaesar, _super);
+    function ShortHairTheCaesar() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    ShortHairTheCaesar.prototype.render = function () {
+        var _a = this, filter1 = _a.filter1, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M1,64 C1.34685629,65.488448 2.67275588,65.2226722 3,64 C2.53726005,62.445722 6.29594493,35.2480719 16,28 C19.618222,25.4833872 39.0082164,23.2319099 58.3126144,23.245568 C77.4086061,23.2590787 96.4208396,25.5105561 100,28 C109.704055,35.2480719 113.46274,62.445722 113,64 C113.327244,65.2226722 114.653144,65.488448 115,64 C115.719178,53.7019177 115,0.274362825 58,1 C1,1.72563718 0.280821545,53.7019177 1,64 Z', id: path2 }),
+                React.createElement("filter", { x: '-0.8%', y: '-2.0%', width: '101.5%', height: '108.0%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' })))),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Short-Hair/The-Caesar', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement(facialHair_1.default, null),
+                    React.createElement("g", { id: 'Hair', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(75.000000, 34.000000)' },
+                        React.createElement("mask", { id: mask2, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path2 })),
+                        React.createElement("use", { id: 'Caesar', fill: '#28354B', xlinkHref: '#' + path2 }),
+                        React.createElement(HairColor_1.default, { maskID: mask2 })),
+                    this.props.children))));
+    };
+    ShortHairTheCaesar.optionValue = 'ShortHairTheCaesar';
+    return ShortHairTheCaesar;
+}(React.Component));
+exports.default = ShortHairTheCaesar;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairTheCaesarSidePart.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairTheCaesarSidePart.d.ts
new file mode 100644
index 000000000..c2ed534ef
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairTheCaesarSidePart.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class ShortHairTheCaesarSidePart extends React.Component {
+    static optionValue: string;
+    private filter1;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairTheCaesarSidePart.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairTheCaesarSidePart.js
new file mode 100644
index 000000000..8036d51aa
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/ShortHairTheCaesarSidePart.js
@@ -0,0 +1,59 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HairColor_1 = require("./HairColor");
+var ShortHairTheCaesarSidePart = /** @class */ (function (_super) {
+    __extends(ShortHairTheCaesarSidePart, _super);
+    function ShortHairTheCaesarSidePart() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    ShortHairTheCaesarSidePart.prototype.render = function () {
+        var _a = this, filter1 = _a.filter1, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M82.0179468,24.3784638 C74.9860629,23.6847351 66.6573358,23.2514721 58.3126144,23.245568 C39.0082164,23.2319099 19.618222,25.4833872 16,28 C6.29594493,35.2480719 2.53726005,62.445722 3,64 C2.67275588,65.2226722 1.34685629,65.488448 1,64 C0.280821545,53.7019177 1,1.72563718 58,1 C115,0.274362825 115.719178,53.7019177 115,64 C114.653144,65.488448 113.327244,65.2226722 113,64 C113.46274,62.445722 109.704055,35.2480719 100,28 C98.2407122,26.7763475 92.7526689,25.6101897 85.3587425,24.7390449 L89,16 L82.0179468,24.3784638 Z', id: path2 }),
+                React.createElement("filter", { x: '-0.8%', y: '-2.0%', width: '101.5%', height: '108.0%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' })))),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Short-Hair/The-Caesar-+-Side-Part', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement(facialHair_1.default, null),
+                    React.createElement("g", { id: 'Hair', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(75.000000, 34.000000)' },
+                        React.createElement("mask", { id: mask2, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path2 })),
+                        React.createElement("use", { id: 'Caesar', fill: '#28354B', xlinkHref: '#' + path2 }),
+                        React.createElement(HairColor_1.default, { maskID: mask2 })),
+                    this.props.children))));
+    };
+    ShortHairTheCaesarSidePart.optionValue = 'ShortHairTheCaesarSidePart';
+    return ShortHairTheCaesarSidePart;
+}(React.Component));
+exports.default = ShortHairTheCaesarSidePart;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Turban.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Turban.d.ts
new file mode 100644
index 000000000..9e28be287
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Turban.d.ts
@@ -0,0 +1,12 @@
+import * as React from 'react';
+export default class Turban extends React.Component {
+    static optionValue: string;
+    private filter1;
+    private mask1;
+    private mask2;
+    private mask3;
+    private path1;
+    private path2;
+    private path3;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Turban.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Turban.js
new file mode 100644
index 000000000..200491bb1
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/Turban.js
@@ -0,0 +1,69 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HatColor_1 = require("./HatColor");
+var Turban = /** @class */ (function (_super) {
+    __extends(Turban, _super);
+    function Turban() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.mask3 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.path3 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    Turban.prototype.render = function () {
+        var _a = this, filter1 = _a.filter1, mask1 = _a.mask1, mask2 = _a.mask2, mask3 = _a.mask3, path1 = _a.path1, path2 = _a.path2, path3 = _a.path3;
+        return (React.createElement("g", { id: 'Top', strokeWidth: '1', fillRule: 'evenodd' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path1, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M156,180.610951 C173.530782,172.282984 186.048193,155.114792 187.791419,134.867187 C193.569129,134.002364 198,129.018625 198,123 L198,110 C198,104.054007 193.675427,99.1180731 188,98.1659169 L188,92 C188,61.072054 162.927946,36 132,36 C101.072054,36 76,61.072054 76,92 L76,92 L76,98.1659169 C70.3245733,99.1180731 66,104.054007 66,110 L66,123 C66,129.018625 70.4308707,134.002364 76.2085808,134.867187 C77.9518066,155.114792 90.4692178,172.282984 108,180.610951 L108,199 L104,199 L104,199 C64.235498,199 32,231.235498 32,271 L32,280 L232,280 L232,271 C232,231.235498 199.764502,199 160,199 L156,199 L156,180.610951 Z M0,5.68434189e-14 L264,5.68434189e-14 L264,280 L0,280 L0,5.68434189e-14 Z', id: path2 }),
+                React.createElement("path", { d: 'M83.9715543,55.8170792 C107.404232,69.414362 145.114919,82.1112884 139,138 C158.377483,132.360101 168.044149,116.801277 168,91.3235294 C167.918252,44.1482824 115.850571,6.80154462e-15 86,0 C85.3259486,0 84.6559706,0.0296343787 83.9916946,0.0880669528 C83.3328225,0.0296343217 82.6684563,0 82.0002187,0 C52.0737254,6.80154462e-15 0.0804892181,44.1482783 0.00021866091,91.3235294 C-0.0442202163,117.440393 9.62244645,132.999216 29.0002187,138 C22.8618971,82.1112789 60.5101967,69.4143577 83.9715662,55.8170722 Z', id: path3 }),
+                React.createElement("filter", { x: '-0.8%', y: '-2.0%', width: '101.5%', height: '108.0%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' })))),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Accesories/Turban', mask: "url(#" + mask1 + ")" },
+                React.createElement("g", { transform: 'translate(-1.000000, 0.000000)' },
+                    React.createElement(facialHair_1.default, null),
+                    React.createElement("g", { id: 'Behind', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(1.000000, 0.000000)' },
+                        React.createElement("mask", { id: mask2, fill: 'white' },
+                            React.createElement("use", { xlinkHref: '#' + path2 })),
+                        React.createElement("g", { id: 'Mask-Hair' })),
+                    React.createElement("g", { id: 'Turban', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(1.000000, 0.000000)' },
+                        React.createElement("path", { d: 'M74.5304294,97.5 C73.529284,95.0905557 73,92.5798498 73,90 C73,71.7746033 99.4151998,57 132,57 C164.5848,57 191,71.7746033 191,90 C191,92.5798498 190.470716,95.0905557 189.469571,97.5 C183.398106,82.8878805 159.972341,72 132,72 C104.027659,72 80.6018941,82.8878805 74.5304294,97.5 Z', id: 'Band', fill: '#EDECE3' }),
+                        React.createElement("g", { transform: 'translate(48.000000, 3.000000)' },
+                            React.createElement("mask", { id: mask3, fill: 'white' },
+                                React.createElement("use", { xlinkHref: '#' + path3 })),
+                            React.createElement("use", { id: 'Turban-Mask', fill: '#124C74', xlinkHref: '#' + path3 }),
+                            React.createElement(HatColor_1.default, { maskID: mask3, defaultColor: 'Blue03' })),
+                        React.createElement("path", { d: 'M48.0110963,96.0123559 C48.3807929,121.112082 58.0438337,136.107963 77.0002187,141 C57.6224465,136.289117 47.9557798,121.632254 48.0002187,97.0294118 C48.0008313,96.6902213 48.0044682,96.351197 48.0110963,96.0123559 Z M152.645822,30.4681115 C153.39011,36.1953086 152.126202,42.8891982 148.000219,50.135763 C136.847465,71.5667661 76.561434,72.0039826 76.3339794,129.679698 C76.1051437,67.7612631 136.805324,67.3799133 148.000219,44.5441176 C150.669864,39.5668152 152.141299,34.8351296 152.645822,30.4681115 Z', id: 'Shadow', fillOpacity: '0.16', fill: '#000000' })),
+                    this.props.children))));
+    };
+    Turban.optionValue = 'Turban';
+    return Turban;
+}(React.Component));
+exports.default = Turban;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat1.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat1.d.ts
new file mode 100644
index 000000000..4c21589bb
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat1.d.ts
@@ -0,0 +1,11 @@
+import * as React from 'react';
+export default class WinterHat1 extends React.Component {
+    static optionValue: string;
+    private filter1;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    private path3;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat1.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat1.js
new file mode 100644
index 000000000..bf0c1e9cc
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat1.js
@@ -0,0 +1,61 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HatColor_1 = require("./HatColor");
+var WinterHat1 = /** @class */ (function (_super) {
+    __extends(WinterHat1, _super);
+    function WinterHat1() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.path3 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    WinterHat1.prototype.render = function () {
+        var _a = this, filter1 = _a.filter1, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2, path3 = _a.path3;
+        return (React.createElement("g", { id: "Top" },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path3, x: "0", y: "0", width: "264", height: "280" }),
+                React.createElement("path", { d: "M120,54 L20,54 L20,155 C20,160.522847 15.5228475,165 10,165 C4.4771525,165 6.76353751e-16,160.522847 0,155 L0,54 L0,44 C-2.9759565e-15,19.699471 19.699471,4.46393476e-15 44,0 L96,0 C120.300529,-4.46393476e-15 140,19.699471 140,44 L140,54 L140,155 C140,160.522847 135.522847,165 130,165 C124.477153,165 120,160.522847 120,155 L120,54 Z", id: path1 }),
+                React.createElement("filter", { x: "-0.8%", y: "-2.8%", width: "101.7%", height: "111.1%", filterUnits: "objectBoundingBox", id: filter1 },
+                    React.createElement("feOffset", { dx: "0", dy: "2", in: "SourceAlpha", result: "shadowOffsetOuter1" }),
+                    React.createElement("feColorMatrix", { values: "0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0", type: "matrix", in: "shadowOffsetOuter1" })),
+                React.createElement("rect", { id: path2, x: "74", y: "50", width: "118", height: "36", rx: "8" })),
+            React.createElement("mask", { id: mask1, fill: "white" },
+                React.createElement("use", { xlinkHref: '#' + path3 })),
+            React.createElement("g", { id: "Mask" }),
+            React.createElement("g", { id: "Top/Accessories/Winter-Hat-1", transform: "translate(-1.000000, 0.000000)" },
+                React.createElement("g", { id: "hat", strokeWidth: "1", fillRule: "evenodd", transform: "translate(63.000000, 20.000000)" },
+                    React.createElement("path", { d: "M1,48 L23.6714286,48 L23.6714286,153.664286 C23.6714286,159.924828 18.5962564,165 12.3357143,165 C6.07517216,165 1,159.924828 1,153.664286 L1,48 Z M116.328571,48 L139,48 L139,153.664286 C139,159.924828 133.924828,165 127.664286,165 C121.403744,165 116.328571,159.924828 116.328571,153.664286 L116.328571,48 Z", id: "inside", fill: "#F4F4F4" }),
+                    React.createElement("mask", { id: mask2, fill: "white" },
+                        React.createElement("use", { xlinkHref: '#' + path1 })),
+                    React.createElement("use", { id: "hat-mask", fill: "#D8D8D8", xlinkHref: '#' + path1 }),
+                    React.createElement(HatColor_1.default, { maskID: mask2, defaultColor: "Red" })),
+                React.createElement("g", { id: "hat-front" },
+                    React.createElement("use", { fill: "black", fillOpacity: "1", filter: "url(#" + path2 + ")", xlinkHref: '#' + path2 }),
+                    React.createElement("use", { fill: "#F4F4F4", fillRule: "evenodd", xlinkHref: '#' + path2 })),
+                React.createElement(facialHair_1.default, null),
+                this.props.children)));
+    };
+    WinterHat1.optionValue = 'WinterHat1';
+    return WinterHat1;
+}(React.Component));
+exports.default = WinterHat1;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat2.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat2.d.ts
new file mode 100644
index 000000000..62212a8ee
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat2.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class WinterHat2 extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    private path3;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat2.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat2.js
new file mode 100644
index 000000000..71726d544
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat2.js
@@ -0,0 +1,70 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HatColor_1 = require("./HatColor");
+var WinterHat2 = /** @class */ (function (_super) {
+    __extends(WinterHat2, _super);
+    function WinterHat2() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.path3 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    WinterHat2.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2, path3 = _a.path3;
+        return (React.createElement("g", { id: 'Top' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path3, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M72,21 C126.772655,21 144,68.8032255 144,103.04488 L144,176.910255 C144,196.404852 121.366901,196.446757 121.366901,165.988782 L121.366901,86.5347425 C121.366901,80.4596103 117.635097,77.5347425 111.551408,77.5347425 L72,77.5347425 L32.4485915,77.5347425 C26.3649028,77.5347425 22.6330986,80.4596103 22.6330986,86.5347425 L22.6330986,165.988782 C22.6330986,196.446757 -1.41137102e-14,196.404852 0,176.910255 L0,103.04488 C-7.11930515e-15,68.8032255 17.2273451,21 72,21 Z', id: path1 }),
+                React.createElement("path", { d: 'M101.428403,98.1685688 C98.9148372,100.462621 96.23722,101.494309 92.8529444,100.772863 C92.2705777,100.648833 89.8963391,96.2345713 83.9998344,96.2345713 C78.1033297,96.2345713 75.7294253,100.648833 75.1467245,100.772863 C71.7624488,101.494309 69.0848316,100.462621 66.5712661,98.1685688 C61.8461772,93.855604 57.9166219,87.9081858 60.2778299,81.4191814 C61.5083844,78.0369425 63.5097479,74.3237342 67.1506257,73.2459109 C71.0384163,72.0955419 76.4968931,73.2439051 80.4147542,72.4582708 C81.6840664,72.2035248 83.0706538,71.7508657 83.9998344,71 C84.929015,71.7508657 86.3159365,72.2035248 87.5845805,72.4582708 C91.5027758,73.2439051 96.9612525,72.0955419 100.849043,73.2459109 C104.489921,74.3237342 106.491284,78.0369425 107.722173,81.4191814 C110.083381,87.9081858 106.153826,93.855604 101.428403,98.1685688 M140.081033,26 C136.670693,34.4002532 137.987774,44.8580348 137.356666,53.6758724 C136.844038,60.8431942 135.33712,71.5857526 128.972858,76.214531 C125.718361,78.5816138 119.79436,82.5598986 115.54187,81.4501943 C112.614539,80.6863848 112.302182,72.290096 108.455284,69.1469801 C104.09172,65.5823153 98.6429854,64.0160432 93.1491481,64.2578722 C90.7785381,64.3622683 85.9841367,64.3374908 83.9999331,66.1604584 C82.0157295,64.3374908 77.2216647,64.3622683 74.8510547,64.2578722 C69.3568808,64.0160432 63.9081467,65.5823153 59.5445817,69.1469801 C55.6976839,72.290096 55.3856641,80.6863848 52.4583326,81.4501943 C48.2058427,82.5598986 42.2818421,78.5816138 39.0270077,76.214531 C32.6624096,71.5857526 31.1561652,60.8431942 30.642864,53.6758724 C30.0120926,44.8580348 31.3291729,34.4002532 27.9188335,26 C26.2597768,26 27.3540339,42.1288693 27.3540339,42.1288693 L27.3540339,62.4851205 C27.3856735,77.7732046 36.935095,100.655445 58.1080116,109.393004 C63.2861266,111.52982 75.0153111,115 83.9999331,115 C92.9845551,115 104.71374,111.860188 109.891855,109.723371 C131.064771,100.985813 140.614193,77.7732046 140.646169,62.4851205 L140.646169,42.1288693 C140.646169,42.1288693 141.740089,26 140.081033,26', id: path2 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path3 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Accessories/Winter-Hat-2', transform: 'translate(-1.000000, 0.000000)' },
+                React.createElement("g", { id: 'hat', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(61.000000, 0.000000)' },
+                    React.createElement("g", { id: 'string', transform: 'translate(0.000000, 176.000000)', fill: '#F4F4F4' },
+                        React.createElement("circle", { id: 'puff', cx: '9', cy: '65', r: '9' }),
+                        React.createElement("rect", { x: '8', y: '0', width: '2', height: '58' })),
+                    React.createElement("g", { id: 'string', transform: 'translate(126.000000, 168.000000)', fill: '#F4F4F4' },
+                        React.createElement("circle", { id: 'puff', cx: '9', cy: '65', r: '9' }),
+                        React.createElement("rect", { x: '8', y: '0', width: '2', height: '58' })),
+                    React.createElement("circle", { id: 'puff', fill: '#F4F4F4', cx: '72', cy: '20', r: '20' }),
+                    React.createElement("mask", { id: mask2, fill: 'white' },
+                        React.createElement("use", { xlinkHref: '#' + path1 })),
+                    React.createElement("use", { id: 'Combined-Shape', fill: '#F4F4F4', xlinkHref: '#' + path1 }),
+                    React.createElement(HatColor_1.default, { maskID: mask2, defaultColor: 'Blue01' }),
+                    React.createElement("rect", { id: 'color-dark', fillOpacity: '0.2', fill: '#000000', x: '-1', y: '21', width: '146', height: '46', mask: "url(#" + mask2 + ")" }),
+                    React.createElement("g", { id: 'light-triangles', transform: 'translate(29.000000, 32.000000)', fill: '#FFFFFF', fillOpacity: '0.5' },
+                        React.createElement("polygon", { id: 'Triangle', transform: 'translate(12.500000, 9.000000) rotate(180.000000) translate(-12.500000, -9.000000) ', points: '12.5 0 25 18 0 18' }),
+                        React.createElement("polygon", { id: 'Triangle', transform: 'translate(43.500000, 9.000000) rotate(180.000000) translate(-43.500000, -9.000000) ', points: '43.5 0 56 18 31 18' }),
+                        React.createElement("polygon", { id: 'Triangle', transform: 'translate(74.500000, 9.000000) rotate(180.000000) translate(-74.500000, -9.000000) ', points: '74.5 0 87 18 62 18' })),
+                    React.createElement("g", { id: 'dark-triangles', transform: 'translate(13.000000, 41.000000)', fill: '#000000', fillOpacity: '0.5' },
+                        React.createElement("polygon", { id: 'Triangle', points: '12.5 0 25 18 0 18' }),
+                        React.createElement("polygon", { id: 'Triangle', points: '43.5 0 56 18 31 18' }),
+                        React.createElement("polygon", { id: 'Triangle', points: '74.5 0 87 18 62 18' }),
+                        React.createElement("polygon", { id: 'Triangle', points: '105.5 0 118 18 93 18' }))),
+                React.createElement(facialHair_1.default, null),
+                this.props.children)));
+    };
+    WinterHat2.optionValue = 'WinterHat2';
+    return WinterHat2;
+}(React.Component));
+exports.default = WinterHat2;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat3.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat3.d.ts
new file mode 100644
index 000000000..92380db53
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat3.d.ts
@@ -0,0 +1,11 @@
+import * as React from 'react';
+export default class WinterHat3 extends React.Component {
+    static optionValue: string;
+    private filter1;
+    private mask1;
+    private mask2;
+    private path1;
+    private path2;
+    private path3;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat3.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat3.js
new file mode 100644
index 000000000..b745991a8
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat3.js
@@ -0,0 +1,61 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HatColor_1 = require("./HatColor");
+var WinterHat3 = /** @class */ (function (_super) {
+    __extends(WinterHat3, _super);
+    function WinterHat3() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.path3 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    WinterHat3.prototype.render = function () {
+        var _a = this, filter1 = _a.filter1, mask1 = _a.mask1, mask2 = _a.mask2, path1 = _a.path1, path2 = _a.path2, path3 = _a.path3;
+        return (React.createElement("g", { id: 'Top' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path3, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M66,0 L66,0 C102.450793,-6.69590214e-15 132,29.5492065 132,66 L132,71 L0,71 L0,66 C-4.46393476e-15,29.5492065 29.5492065,6.69590214e-15 66,0 Z', id: path1 }),
+                React.createElement("filter", { x: '-0.7%', y: '-1.7%', width: '101.4%', height: '106.8%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0', type: 'matrix', in: 'shadowOffsetOuter1' })),
+                React.createElement("path", { d: 'M67.2846026,61.4514246 C83.229708,49.8171415 105.159178,44 133.073012,44 C160.985408,44 182.871592,49.8165424 198.731564,61.4496271 L198.731562,61.4496305 C200.786183,62.956669 202.000006,65.3523289 202.000006,67.900394 L202.000004,98.3697692 C202.000004,100.578907 200.209144,102.369768 198.000006,102.369768 C197.244444,102.369768 196.504332,102.155773 195.865355,101.752558 C179.223261,91.2508526 158.536251,86 133.804323,86 C108.883259,86 87.640395,91.3314713 70.0757313,101.994414 L70.0757317,101.994414 C68.1873241,103.140806 65.7271332,102.539283 64.5807417,100.650875 C64.2008775,100.02514 64.0000054,99.3071624 64.0000054,98.5751499 L64,67.914014 C64,65.358892 65.2205159,62.9574773 67.2846026,61.4514246 Z', id: path2 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path3 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Accessories/Winter-Hat-3', transform: 'translate(-1.000000, 0.000000)' },
+                React.createElement("g", { id: 'hat', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(67.000000, 12.000000)' },
+                    React.createElement("circle", { id: 'puff', fill: '#F4F4F4', cx: '66', cy: '8', r: '20' }),
+                    React.createElement("mask", { id: mask2, fill: 'white' },
+                        React.createElement("use", { xlinkHref: '#' + path1 })),
+                    React.createElement("use", { id: 'hat-mask', fill: '#D8D8D8', xlinkHref: '#' + path1 }),
+                    React.createElement(HatColor_1.default, { maskID: mask2, defaultColor: 'Red' })),
+                React.createElement("g", { id: 'hat-front' },
+                    React.createElement("use", { fill: 'black', fillOpacity: '1', filter: "url(#" + path2 + ")", xlinkHref: '#' + path2 }),
+                    React.createElement("use", { fill: '#F4F4F4', fillRule: 'evenodd', xlinkHref: '#' + path2 })),
+                React.createElement(facialHair_1.default, null),
+                this.props.children)));
+    };
+    WinterHat3.optionValue = 'WinterHat3';
+    return WinterHat3;
+}(React.Component));
+exports.default = WinterHat3;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat4.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat4.d.ts
new file mode 100644
index 000000000..6aafd3ff5
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat4.d.ts
@@ -0,0 +1,15 @@
+import * as React from 'react';
+export default class WinterHat4 extends React.Component {
+    static optionValue: string;
+    private filter1;
+    private mask1;
+    private mask2;
+    private mask3;
+    private mask4;
+    private path1;
+    private path2;
+    private path3;
+    private path4;
+    private path5;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat4.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat4.js
new file mode 100644
index 000000000..627ac77d3
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/WinterHat4.js
@@ -0,0 +1,72 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var facialHair_1 = require("./facialHair");
+var HatColor_1 = require("./HatColor");
+var WinterHat4 = /** @class */ (function (_super) {
+    __extends(WinterHat4, _super);
+    function WinterHat4() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.mask2 = lodash_1.uniqueId('react-mask-');
+        _this.mask3 = lodash_1.uniqueId('react-mask-');
+        _this.mask4 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.path3 = lodash_1.uniqueId('react-path-');
+        _this.path4 = lodash_1.uniqueId('react-path-');
+        _this.path5 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    WinterHat4.prototype.render = function () {
+        var _a = this, filter1 = _a.filter1, mask1 = _a.mask1, mask2 = _a.mask2, mask3 = _a.mask3, mask4 = _a.mask4, path1 = _a.path1, path2 = _a.path2, path3 = _a.path3, path4 = _a.path4, path5 = _a.path5;
+        return (React.createElement("g", { id: 'Top' },
+            React.createElement("defs", null,
+                React.createElement("rect", { id: path5, x: '0', y: '0', width: '264', height: '280' }),
+                React.createElement("path", { d: 'M129.659138,38.3566287 C132.459581,45.3577056 134,52.9989608 134,61 L134,69 L2,69 L2,61 C2,52.9748603 3.54971254,45.3116754 6.36620203,38.2933809 C-0.0371821146,24.8304767 -1.28053094,13.7727805 2.63615554,5.12029235 C10.141056,2.84355825 18.8342301,4.64979084 28.7156778,10.5389901 C38.4862647,3.88774159 50.289117,-4.77047603e-15 63,-7.10542736e-15 L73,-7.10542736e-15 C85.7221104,-9.44244112e-15 97.5345852,3.89461262 107.310208,10.5566215 C117.203883,4.65339747 125.906912,2.84128775 133.419297,5.12029235 C137.342115,13.7863263 136.088729,24.8651051 129.659138,38.3566287 Z', id: path1 }),
+                React.createElement("path", { d: 'M28.7156857,10.5389848 C18.758718,17.3171083 10.9122881,26.9651756 6.36620203,38.2933809 C-0.0371821146,24.8304767 -1.28053094,13.7727805 2.63615554,5.12029235 C10.1410556,2.84355836 18.8342292,4.64979066 28.7156763,10.5389892 Z M129.659138,38.3566287 C125.120833,27.0109143 117.273404,17.34646 107.310208,10.5566215 C117.203883,4.65339747 125.906912,2.84128775 133.419297,5.12029235 C137.342115,13.7863263 136.088729,24.8651051 129.659138,38.3566287 Z', id: path2 }),
+                React.createElement("path", { d: 'M21.8615933,15.9591438 C17.3889306,20.0465694 13.5271638,24.7913314 10.4291788,30.040544 C7.50356643,21.9322189 7.00287124,16.3214118 8.92709323,13.2081228 C11.5782173,12.0615989 15.8897174,12.9786059 21.8615933,15.9591438 Z M125.352616,29.6737564 C122.278044,24.5465519 118.471613,19.9084198 114.077736,15.903773 C119.880509,13.0520429 124.083178,12.1889392 126.68574,13.3144617 C128.572308,16.3668294 128.127934,21.8199276 125.352616,29.6737564 Z', id: path3 }),
+                React.createElement("filter", { x: '-0.7%', y: '-1.7%', width: '101.4%', height: '106.8%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0', type: 'matrix', in: 'shadowOffsetOuter1' })),
+                React.createElement("path", { d: 'M67.2846026,61.4514246 C83.229708,49.8171415 105.159178,44 133.073012,44 C160.985408,44 182.871592,49.8165424 198.731564,61.4496271 L198.731562,61.4496305 C200.786183,62.956669 202.000006,65.3523289 202.000006,67.900394 L202.000004,98.3697692 C202.000004,100.578907 200.209144,102.369768 198.000006,102.369768 C197.244444,102.369768 196.504332,102.155773 195.865355,101.752558 C179.223261,91.2508526 158.536251,86 133.804323,86 C108.883259,86 87.640395,91.3314713 70.0757313,101.994414 L70.0757317,101.994414 C68.1873241,103.140806 65.7271332,102.539283 64.5807417,100.650875 C64.2008775,100.02514 64.0000054,99.3071624 64.0000054,98.5751499 L64,67.914014 C64,65.358892 65.2205159,62.9574773 67.2846026,61.4514246 Z', id: path4 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path5 })),
+            React.createElement("g", { id: 'Mask' }),
+            React.createElement("g", { id: 'Top/Accessories/Winter-Hat-4', transform: 'translate(-1.000000, 0.000000)' },
+                React.createElement("g", { id: 'hat', strokeWidth: '1', fillRule: 'evenodd', transform: 'translate(65.000000, 4.000000)' },
+                    React.createElement("mask", { id: mask2, fill: 'white' },
+                        React.createElement("use", { xlinkHref: '#' + path1 })),
+                    React.createElement("use", { id: 'hat-mask', fill: '#D8D8D8', xlinkHref: '#' + path1 }),
+                    React.createElement(HatColor_1.default, { maskID: mask2, defaultColor: 'Red' }),
+                    React.createElement("mask", { id: mask3, fill: 'white' },
+                        React.createElement("use", { xlinkHref: '#' + path2 })),
+                    React.createElement("use", { id: 'shadow', fillOpacity: '0.24', fill: '#000000', xlinkHref: '#' + path2 }),
+                    React.createElement("mask", { id: mask4, fill: 'white' },
+                        React.createElement("use", { xlinkHref: '#' + path3 })),
+                    React.createElement("use", { id: 'light', fillOpacity: '0.300000012', fill: '#FFFFFF', xlinkHref: '#' + path3 })),
+                React.createElement("g", { id: 'hat-front' },
+                    React.createElement("use", { fill: 'black', fillOpacity: '1', filter: "url(#" + path4 + ")", xlinkHref: '#' + path4 }),
+                    React.createElement("use", { fill: '#F4F4F4', fillRule: 'evenodd', xlinkHref: '#' + path4 })),
+                React.createElement(facialHair_1.default, null),
+                this.props.children)));
+    };
+    WinterHat4.optionValue = 'WinterHat4';
+    return WinterHat4;
+}(React.Component));
+exports.default = WinterHat4;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Blank.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Blank.d.ts
new file mode 100644
index 000000000..998ae7c80
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Blank.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Blank extends React.Component {
+    static optionValue: string;
+    render(): null;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Blank.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Blank.js
new file mode 100644
index 000000000..29335bbc7
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Blank.js
@@ -0,0 +1,28 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Blank = /** @class */ (function (_super) {
+    __extends(Blank, _super);
+    function Blank() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Blank.prototype.render = function () {
+        return null;
+    };
+    Blank.optionValue = 'Blank';
+    return Blank;
+}(React.Component));
+exports.default = Blank;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Kurt.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Kurt.d.ts
new file mode 100644
index 000000000..ea558633e
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Kurt.d.ts
@@ -0,0 +1,6 @@
+import * as React from 'react';
+export default class Kurt extends React.Component {
+    static optionValue: string;
+    private filter1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Kurt.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Kurt.js
new file mode 100644
index 000000000..66eefc4e0
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Kurt.js
@@ -0,0 +1,43 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Kurt = /** @class */ (function (_super) {
+    __extends(Kurt, _super);
+    function Kurt() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        return _this;
+    }
+    Kurt.prototype.render = function () {
+        var filter1 = this.filter1;
+        return (React.createElement("g", { id: 'Top/_Resources/Kurt', fill: 'none', transform: 'translate(62.000000, 85.000000)', strokeWidth: '1' },
+            React.createElement("defs", null,
+                React.createElement("filter", { x: '-0.8%', y: '-2.0%', width: '101.5%', height: '108.0%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' })))),
+            React.createElement("g", { id: 'Kurts', filter: "url(#" + filter1 + ")", transform: 'translate(5.000000, 2.000000)' },
+                React.createElement("path", { d: 'M66,11.1111111 C54.9625586,11.1111111 53.3705645,2.0266011 30.6705882,0.740740741 C7.98552275,-0.283199952 0.815225204,6.4494855 0.776470588,11.1111111 C0.813236892,15.4042795 -0.352293566,26.5612661 14.3647059,39.6296296 C29.1367705,55.1420807 44.2704162,49.8818301 49.6941176,44.8148148 C55.1352081,42.4731118 61.3403442,21.4596351 66,21.4814815 C70.6596558,21.5033279 76.8647919,42.4731118 82.3058824,44.8148148 C87.7295838,49.8818301 102.86323,55.1420807 117.635294,39.6296296 C132.352294,26.5612661 131.186763,15.4042795 131.223529,11.1111111 C131.184775,6.4494855 124.014477,-0.283199952 101.329412,0.740740741 C78.6294355,2.0266011 77.0374414,11.1111111 66,11.1111111 Z', id: 'It!', fill: '#F4F4F4', fillRule: 'nonzero' }),
+                React.createElement("path", { d: 'M55.1294118,21.4814815 C55.5103632,13.8233491 42.2156493,5.64243259 27.9529412,5.92592593 C13.6973442,6.22450879 11.8417942,15.3786982 11.6470588,18.8888889 C11.2982286,27.0220633 20.014463,45.3037598 36.1058824,44.8148148 C52.1972736,44.305848 54.9092435,26.5344305 55.1294118,21.4814815 Z', id: 'Did', fill: '#2F383B', fillRule: 'nonzero' }),
+                React.createElement("path", { d: 'M120.352941,21.4814815 C120.733893,13.8233491 107.439179,5.64243259 93.1764706,5.92592593 C78.9208736,6.22450879 77.0653236,15.3786982 76.8705882,18.8888889 C76.521758,27.0220633 85.2379924,45.3037598 101.329412,44.8148148 C117.420803,44.305848 120.132773,26.5344305 120.352941,21.4814815 Z', id: 'Courtney', fill: '#2F383B', fillRule: 'nonzero', transform: 'translate(98.611765, 25.370370) scale(-1, 1) translate(-98.611765, -25.370370) ' }))));
+    };
+    Kurt.optionValue = 'Kurt';
+    return Kurt;
+}(React.Component));
+exports.default = Kurt;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Prescription01.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Prescription01.d.ts
new file mode 100644
index 000000000..451ec2879
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Prescription01.d.ts
@@ -0,0 +1,6 @@
+import * as React from 'react';
+export default class Prescription01 extends React.Component {
+    static optionValue: string;
+    private filter1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Prescription01.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Prescription01.js
new file mode 100644
index 000000000..e728a3a1e
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Prescription01.js
@@ -0,0 +1,45 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Prescription01 = /** @class */ (function (_super) {
+    __extends(Prescription01, _super);
+    function Prescription01() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        return _this;
+    }
+    Prescription01.prototype.render = function () {
+        var filter1 = this.filter1;
+        return (React.createElement("g", { id: 'Top/_Resources/Prescription-01', fill: 'none', transform: 'translate(62.000000, 85.000000)', strokeWidth: '1' },
+            React.createElement("defs", null,
+                React.createElement("filter", { x: '-0.8%', y: '-2.4%', width: '101.5%', height: '109.8%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' })))),
+            React.createElement("g", { id: 'Glasses', filter: "url(#" + filter1 + ")", transform: 'translate(8.000000, 8.000000)', fill: '#D6EAF2' },
+                React.createElement("path", { d: 'M46.2491397,7.27516667 C48.6207695,7.2975 49.7419096,7.69183333 50.1459601,10.1651667 C50.5553446,12.6705 50.1572949,15.4871667 49.6852359,17.9548333 C48.9648125,21.7228333 47.7666627,25.4145 44.9776475,28.1685 C43.5084639,29.6188333 41.7165732,30.7748333 39.8106684,31.5641667 C38.7985419,31.9835 37.7297416,32.2861667 36.6612747,32.5158333 C36.3489024,32.5828333 33.6822357,32.9501667 35.3177735,32.7635 C31.5009631,33.1991667 27.3601122,33.1818333 24.1723805,30.7525 C20.6396056,28.0601667 18.2203032,23.7998333 17.1565036,19.5561667 C16.5340925,17.0731667 15.2262624,11.1345 17.6158944,9.14916667 C20.3532365,6.8745 46.2491397,7.27516667 46.2491397,7.27516667 L46.2491397,7.27516667 Z M22.2178029,0.4905 C16.7774562,0.677833333 13.1466691,1.63383333 10.4633337,7.06916667 C5.54571911,17.0301667 13.9627711,31.9688333 23.352278,36.0395 C34.3293166,40.7991667 46.5921826,35.5318333 52.3955746,26.0058333 C55.4689587,20.9621667 57.0224862,13.3231667 56.9224737,7.50383333 C56.7951245,0.0765 51.6071427,-0.1295 45.5090472,0.0338333333 L22.2178029,0.4905 Z', id: 'Frame-Stuff' }),
+                React.createElement("path", { d: 'M79.6805515,7.27256667 C77.3089217,7.29523333 76.1877816,7.68923333 75.7837311,10.1625667 C75.3743466,12.6679 75.7723963,15.4845667 76.244122,17.9522333 C76.9648787,21.7202333 78.1630285,25.4119 80.9520437,28.1659 C82.4212273,29.6162333 84.213118,30.7722333 86.1190228,31.5619 C87.1311493,31.9809 88.1999496,32.2835667 89.2684165,32.5132333 C89.5807888,32.5802333 92.2471221,32.9479 90.6119177,32.7609 C94.4287281,33.1965667 98.569579,33.1792333 101.757311,30.7499 C105.290086,28.0575667 107.709388,23.7975667 108.773188,19.5539 C109.395599,17.0705667 110.703095,11.1322333 108.313797,9.14656667 C105.576455,6.8719 79.6805515,7.27256667 79.6805515,7.27256667 L79.6805515,7.27256667 Z M103.711555,0.4879 C109.152235,0.675233333 112.783022,1.63156667 115.466357,7.06656667 C120.383639,17.0275667 111.96692,31.9662333 102.577413,36.0372333 C91.6003746,40.7965667 79.3375086,35.5292333 73.5337832,26.0035667 C70.4607325,20.9595667 68.907205,13.3205667 69.0068841,7.50123333 C69.1345667,0.0739 74.3225485,-0.1321 80.420644,0.0315666667 L103.711555,0.4879 Z', id: 'Frame-Stuff' }),
+                React.createElement("path", { d: 'M13.1969483,4.9267 C9.78501392,5.11836667 5.88606327,5.16436667 2.69005822,6.63936667 C-0.69461078,8.20136667 -1.2176675,11.7387 3.04920921,12.2260333 C4.97094906,12.4457 6.89488267,12.0827 8.78716336,11.7450333 C10.336903,11.4683667 12.4419791,11.5580333 13.9064752,10.9657 C16.6355213,9.86236667 16.4603333,4.74003333 13.1969483,4.9267', id: 'Frame-Stuff' }),
+                React.createElement("path", { d: 'M112.73467,4.9267 C116.146606,5.11836667 120.045559,5.16436667 123.241565,6.63936667 C126.626236,8.20136667 127.149293,11.7387 122.882414,12.2260333 C120.960673,12.4457 119.036739,12.0827 117.144457,11.7450333 C115.594717,11.4683667 113.489639,11.5580333 112.025143,10.9657 C109.295782,9.86236667 109.471283,4.74003333 112.73467,4.9267', id: 'Frame-Stuff' }),
+                React.createElement("path", { d: 'M73.1094302,7.01263333 C71.1631869,4.71263333 66.0912197,3.38463333 62.8914864,3.38463333 C59.6914198,3.38463333 54.7681378,4.71263333 52.8222279,7.01263333 C51.8407719,8.1723 51.8074344,9.72396667 53.5083137,10.4509667 C55.6262451,11.3566333 57.5174814,9.7143 59.2126933,8.8553 C61.3809643,7.75663333 64.7120473,7.8773 66.7189648,8.8553 C68.4271783,9.68796667 70.3050797,11.3566333 72.4233444,10.4509667 C74.1242237,9.72396667 74.0908862,8.1723 73.1094302,7.01263333', id: 'Frame-Stuff' }))));
+    };
+    Prescription01.optionValue = 'Prescription01';
+    return Prescription01;
+}(React.Component));
+exports.default = Prescription01;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Prescription02.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Prescription02.d.ts
new file mode 100644
index 000000000..0d8595289
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Prescription02.d.ts
@@ -0,0 +1,6 @@
+import * as React from 'react';
+export default class Prescription02 extends React.Component {
+    static optionValue: string;
+    private filter1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Prescription02.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Prescription02.js
new file mode 100644
index 000000000..8b8700fcf
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Prescription02.js
@@ -0,0 +1,43 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Prescription02 = /** @class */ (function (_super) {
+    __extends(Prescription02, _super);
+    function Prescription02() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        return _this;
+    }
+    Prescription02.prototype.render = function () {
+        var filter1 = this.filter1;
+        return (React.createElement("g", { id: 'Top/_Resources/Prescription-02', fill: 'none', transform: 'translate(62.000000, 85.000000)', strokeWidth: '1' },
+            React.createElement("defs", null,
+                React.createElement("filter", { x: '-0.8%', y: '-2.4%', width: '101.5%', height: '109.8%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' })))),
+            React.createElement("g", { id: 'Wayfarers', filter: "url(#" + filter1 + ")", transform: 'translate(6.000000, 7.000000)', fill: '#252C2F' },
+                React.createElement("path", { d: 'M34,41 L31.2421498,41 C17.3147125,41 9,33.3359286 9,20.5 C9,10.127 10.8170058,0 32.5299306,0 L35.4700694,0 C57.1829942,0 59,10.127 59,20.5 C59,32.5686429 48.7212748,41 34,41 Z M32.3853606,6 C13,6 13,12.8410159 13,21.5015498 C13,28.5719428 16.116254,37 30.9709365,37 L34,37 C46.3649085,37 55,30.6270373 55,21.5015498 C55,12.8410159 55,6 35.6146394,6 L32.3853606,6 Z', id: 'Left', fillRule: 'nonzero' }),
+                React.createElement("path", { d: 'M96,41 L93.2421498,41 C79.3147125,41 71,33.3359286 71,20.5 C71,10.127 72.8170058,0 94.5299306,0 L97.4700694,0 C119.182994,0 121,10.127 121,20.5 C121,32.5686429 110.721275,41 96,41 Z M94.3853606,6 C75,6 75,12.8410159 75,21.5015498 C75,28.5719428 78.1194833,37 92.9709365,37 L96,37 C108.364909,37 117,30.6270373 117,21.5015498 C117,12.8410159 117,6 97.6146394,6 L94.3853606,6 Z', id: 'Right', fillRule: 'nonzero' }),
+                React.createElement("path", { d: 'M2.95454545,5.77156439 C3.64590909,5.09629136 11.2095455,0 32.5,0 C50.3513636,0 54.1302273,1.85267217 59.8502273,4.6518809 L60.2689233,4.85850899 C60.6666014,4.99901896 62.7002447,5.68982981 65.0790606,5.76579519 C67.2462948,5.67278567 69.1000195,5.08540191 69.641698,4.89719767 C76.1703915,1.7220864 82.5610971,0 97.5,0 C118.790455,0 126.354091,5.09629136 127.045455,5.77156439 C128.679318,5.77156439 130,7.06150904 130,8.65734659 L130,11.5431288 C130,13.1389663 128.679318,14.428911 127.045455,14.428911 C127.045455,14.428911 120.143997,14.428911 120.143997,17.3146932 C120.143997,20.2004754 118.181818,13.1389663 118.181818,11.5431288 L118.181818,8.73240251 C114.578575,7.35340151 108.128411,4.78617535 97.5,4.78617535 C85.6584651,4.78617535 79.7610984,6.88602813 74.7022935,8.97112368 L74.7588636,9.10752861 L74.7563667,11.0937608 L72.5391666,16.4436339 L69.8004908,15.3608351 C69.5558969,15.2641292 69.0281396,15.090392 68.2963505,14.9099044 C66.256272,14.4067419 64.1589087,14.253569 62.3040836,14.6343084 C61.6235903,14.7739931 60.9922286,14.9836085 60.4128127,15.266732 L57.7704824,16.5578701 L55.1266751,11.3962031 L55.2440909,9.10175705 L55.3248203,8.90683855 C50.9620526,6.87386374 46.9392639,4.78617535 32.5,4.78617535 C21.8721459,4.78617535 15.422131,7.3524397 11.8181818,8.7314671 L11.8181818,11.5431288 C11.8181818,13.1389663 8.86363636,20.2004754 8.86363636,17.3146932 C8.86363636,14.428911 2.95454545,14.428911 2.95454545,14.428911 C1.32363636,14.428911 0,13.1389663 0,11.5431288 L0,8.65734659 C0,7.06150904 1.32363636,5.77156439 2.95454545,5.77156439 Z', id: 'Stuff', fillRule: 'nonzero' }))));
+    };
+    Prescription02.optionValue = 'Prescription02';
+    return Prescription02;
+}(React.Component));
+exports.default = Prescription02;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Round.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Round.d.ts
new file mode 100644
index 000000000..a6f34116c
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Round.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class Round extends React.Component {
+    static optionValue: string;
+    private path1;
+    private filter1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Round.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Round.js
new file mode 100644
index 000000000..70eef7c46
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Round.js
@@ -0,0 +1,41 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Round = /** @class */ (function (_super) {
+    __extends(Round, _super);
+    function Round() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        return _this;
+    }
+    Round.prototype.render = function () {
+        var _a = this, path1 = _a.path1, filter1 = _a.filter1;
+        return (React.createElement("g", { id: 'Top/_Resources/Round', fill: 'none', transform: 'translate(62.000000, 85.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M80.4646192,16.3941179 C84.3801509,8.45869677 92.552602,3 102,3 C110.919691,3 118.702887,7.86591082 122.839921,15.0880638 C123.050197,15.0306504 123.271519,15 123.5,15 L131.5,15 C132.880712,15 134,16.1192881 134,17.5 C134,18.8807119 132.880712,20 131.5,20 L124.963126,20 C125.637355,22.2145921 126,24.5649459 126,27 C126,40.254834 115.254834,51 102,51 C88.745166,51 78,40.254834 78,27 C78,25.5781066 78.1236513,24.1850936 78.3607874,22.8311273 C78.2762458,18.4553035 74.9135957,15 70.8624171,15 C67.1256697,15 63.9747186,17.9397535 63.4417635,21.8300629 C63.8073299,23.4951922 64,25.2250958 64,27 C64,40.254834 53.254834,51 40,51 C26.745166,51 16,40.254834 16,27 C16,24.5649459 16.3626451,22.2145921 17.0368738,20 L10.5,20 C9.11928813,20 8,18.8807119 8,17.5 C8,16.1192881 9.11928813,15 10.5,15 L10.5,15 L18.5,15 C18.728481,15 18.9498033,15.0306504 19.1600793,15.0880638 C23.2971127,7.86591082 31.0803092,3 40,3 C49.3521568,3 57.4549431,8.34919095 61.415666,16.15488 C63.4929212,13.0392725 66.9494432,11 70.8624171,11 C74.8746823,11 78.4070368,13.1440781 80.4646192,16.3941179 Z M40,47 C51.045695,47 60,38.045695 60,27 C60,15.954305 51.045695,7 40,7 C28.954305,7 20,15.954305 20,27 C20,38.045695 28.954305,47 40,47 Z M102,47 C113.045695,47 122,38.045695 122,27 C122,15.954305 113.045695,7 102,7 C90.954305,7 82,15.954305 82,27 C82,38.045695 90.954305,47 102,47 Z', id: path1 }),
+                React.createElement("filter", { x: '-0.8%', y: '-2.1%', width: '101.6%', height: '108.3%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0', type: 'matrix', in: 'shadowOffsetOuter1' }))),
+            React.createElement("g", { id: 'Lennon-Glasses' },
+                React.createElement("use", { fill: 'black', fillOpacity: '1', filter: "url(#" + filter1 + ")", xlinkHref: '#' + path1 }),
+                React.createElement("use", { fill: '#252C2F', fillRule: 'evenodd', xlinkHref: '#' + path1 }))));
+    };
+    Round.optionValue = 'Round';
+    return Round;
+}(React.Component));
+exports.default = Round;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Sunglasses.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Sunglasses.d.ts
new file mode 100644
index 000000000..dd5433ba9
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Sunglasses.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+export default class Sunglasses extends React.Component {
+    static optionValue: string;
+    private path1;
+    private path2;
+    private filter1;
+    private linearGradient1;
+    private linearGradient2;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Sunglasses.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Sunglasses.js
new file mode 100644
index 000000000..e03e72d10
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Sunglasses.js
@@ -0,0 +1,64 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Sunglasses = /** @class */ (function (_super) {
+    __extends(Sunglasses, _super);
+    function Sunglasses() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.linearGradient1 = lodash_1.uniqueId('react-linear-gradient-');
+        _this.linearGradient2 = lodash_1.uniqueId('react-linear-gradient-');
+        return _this;
+    }
+    Sunglasses.prototype.render = function () {
+        var _a = this, path1 = _a.path1, path2 = _a.path2, filter1 = _a.filter1, linearGradient1 = _a.linearGradient1, linearGradient2 = _a.linearGradient2;
+        return (React.createElement("g", { id: 'Top/_Resources/Sunglasses', fill: 'none', transform: 'translate(62.000000, 85.000000)', strokeWidth: '1' },
+            React.createElement("defs", null,
+                React.createElement("filter", { x: '-0.8%', y: '-2.6%', width: '101.6%', height: '110.5%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' }))),
+                React.createElement("path", { d: 'M47.0104611,6.27728008 C49.5212682,6.30134922 50.7082016,6.72633117 51.1359635,9.39189846 C51.5693724,12.0919529 51.1479634,15.1275382 50.648202,17.7869984 C49.8855011,21.8478573 48.6170388,25.8264499 45.6643523,28.794498 C44.1089507,30.3575551 42.2119044,31.6034024 40.1941529,32.4540848 C39.1226305,32.9060098 37.9911085,33.2322006 36.8599395,33.4797175 C36.5292357,33.5519249 33.7060778,33.9478084 35.4375958,33.7466335 C31.3967988,34.2161613 27.0129452,34.1974808 23.6381438,31.5793333 C19.8980507,28.6777448 17.3367734,24.0862872 16.2105455,19.5127916 C15.5516086,16.8368063 14.1670294,10.4365709 16.6968952,8.29693227 C19.5948762,5.84547255 47.0104611,6.27728008 47.0104611,6.27728008 L47.0104611,6.27728008 Z', id: path1 }),
+                React.createElement("path", { d: 'M78.9192315,6.27468008 C76.4084239,6.29910846 75.2214902,6.72373117 74.7937283,9.38929846 C74.3603192,12.0893529 74.7817283,15.1249382 75.2811369,17.7843984 C76.0441909,21.8452573 77.3126534,25.8238499 80.2653406,28.791898 C81.8207425,30.3549551 83.7177893,31.6008024 85.7355412,32.4518441 C86.8070638,32.9034098 87.938586,33.2296006 89.0697553,33.4771175 C89.4004591,33.5493249 92.2232647,33.9455676 90.4920992,33.7440335 C94.5328971,34.2135613 98.9167517,34.1948808 102.291554,31.5767333 C106.031648,28.6751448 108.592926,24.0840464 109.719154,19.5105508 C110.378091,16.8342063 111.762317,10.4343302 109.232804,8.29433227 C106.334822,5.84287255 78.9192315,6.27468008 78.9192315,6.27468008 L78.9192315,6.27468008 Z', id: path2 }),
+                React.createElement("linearGradient", { x1: '50%', y1: '0%', x2: '50%', y2: '70.5058195%', id: linearGradient1 },
+                    React.createElement("stop", { stopColor: '#FFFFFF', stopOpacity: '0.5', offset: '0%' }),
+                    React.createElement("stop", { stopColor: '#000000', stopOpacity: '0.5', offset: '100%' })),
+                React.createElement("linearGradient", { x1: '50%', y1: '0%', x2: '50%', y2: '100%', id: linearGradient2 },
+                    React.createElement("stop", { stopColor: '#FFFFFF', stopOpacity: '0.5', offset: '0%' }),
+                    React.createElement("stop", { stopColor: '#000000', stopOpacity: '0.5', offset: '70.5058195%' }))),
+            React.createElement("g", { id: 'Sunglasses', filter: "url(#" + filter1 + ")", transform: 'translate(8.000000, 8.000000)' },
+                React.createElement("g", { id: 'shades' },
+                    React.createElement("use", { fillOpacity: '0.700000048', fill: '#000000', xlinkHref: '#' + path1 }),
+                    React.createElement("use", { fill: "url(#" + linearGradient1 + ")", style: { mixBlendMode: 'screen' }, xlinkHref: '#' + path1 })),
+                React.createElement("g", { id: 'shades' },
+                    React.createElement("use", { fillOpacity: '0.700000048', fill: '#000000', xlinkHref: '#' + path2 }),
+                    React.createElement("use", { fill: "url(#" + linearGradient2 + ")", style: { mixBlendMode: 'screen' }, xlinkHref: '#' + path2 })),
+                React.createElement("g", { id: 'Glasses', fill: '#252C2F' },
+                    React.createElement("path", { d: 'M46.2491397,7.27516667 C48.6207695,7.2975 49.7419096,7.69183333 50.1459601,10.1651667 C50.5553446,12.6705 50.1572949,15.4871667 49.6852359,17.9548333 C48.9648125,21.7228333 47.7666627,25.4145 44.9776475,28.1685 C43.5084639,29.6188333 41.7165732,30.7748333 39.8106684,31.5641667 C38.7985419,31.9835 37.7297416,32.2861667 36.6612747,32.5158333 C36.3489024,32.5828333 33.6822357,32.9501667 35.3177735,32.7635 C31.5009631,33.1991667 27.3601122,33.1818333 24.1723805,30.7525 C20.6396056,28.0601667 18.2203032,23.7998333 17.1565036,19.5561667 C16.5340925,17.0731667 15.2262624,11.1345 17.6158944,9.14916667 C20.3532365,6.8745 46.2491397,7.27516667 46.2491397,7.27516667 L46.2491397,7.27516667 Z M22.2178029,0.4905 C16.7774562,0.677833333 13.1466691,1.63383333 10.4633337,7.06916667 C5.54571911,17.0301667 13.9627711,31.9688333 23.352278,36.0395 C34.3293166,40.7991667 46.5921826,35.5318333 52.3955746,26.0058333 C55.4689587,20.9621667 57.0224862,13.3231667 56.9224737,7.50383333 C56.7951245,0.0765 51.6071427,-0.1295 45.5090472,0.0338333333 L22.2178029,0.4905 Z', id: 'Frame' }),
+                    React.createElement("path", { d: 'M79.6805515,7.27256667 C77.3089217,7.29523333 76.1877816,7.68923333 75.7837311,10.1625667 C75.3743466,12.6679 75.7723963,15.4845667 76.244122,17.9522333 C76.9648787,21.7202333 78.1630285,25.4119 80.9520437,28.1659 C82.4212273,29.6162333 84.213118,30.7722333 86.1190228,31.5619 C87.1311493,31.9809 88.1999496,32.2835667 89.2684165,32.5132333 C89.5807888,32.5802333 92.2471221,32.9479 90.6119177,32.7609 C94.4287281,33.1965667 98.569579,33.1792333 101.757311,30.7499 C105.290086,28.0575667 107.709388,23.7975667 108.773188,19.5539 C109.395599,17.0705667 110.703095,11.1322333 108.313797,9.14656667 C105.576455,6.8719 79.6805515,7.27256667 79.6805515,7.27256667 L79.6805515,7.27256667 Z M103.711555,0.4879 C109.152235,0.675233333 112.783022,1.63156667 115.466357,7.06656667 C120.383639,17.0275667 111.96692,31.9662333 102.577413,36.0372333 C91.6003746,40.7965667 79.3375086,35.5292333 73.5337832,26.0035667 C70.4607325,20.9595667 68.907205,13.3205667 69.0068841,7.50123333 C69.1345667,0.0739 74.3225485,-0.1321 80.420644,0.0315666667 L103.711555,0.4879 Z', id: 'Frame' }),
+                    React.createElement("path", { d: 'M13.1969483,4.9267 C9.78501392,5.11836667 5.88606327,5.16436667 2.69005822,6.63936667 C-0.69461078,8.20136667 -1.2176675,11.7387 3.04920921,12.2260333 C4.97094906,12.4457 6.89488267,12.0827 8.78716336,11.7450333 C10.336903,11.4683667 12.4419791,11.5580333 13.9064752,10.9657 C16.6355213,9.86236667 16.4603333,4.74003333 13.1969483,4.9267', id: 'Frame' }),
+                    React.createElement("path", { d: 'M112.73467,4.9267 C116.146606,5.11836667 120.045559,5.16436667 123.241565,6.63936667 C126.626236,8.20136667 127.149293,11.7387 122.882414,12.2260333 C120.960673,12.4457 119.036739,12.0827 117.144457,11.7450333 C115.594717,11.4683667 113.489639,11.5580333 112.025143,10.9657 C109.295782,9.86236667 109.471283,4.74003333 112.73467,4.9267', id: 'Frame' }),
+                    React.createElement("path", { d: 'M73.1094302,7.01263333 C71.1631869,4.71263333 66.0912197,3.38463333 62.8914864,3.38463333 C59.6914198,3.38463333 54.7681378,4.71263333 52.8222279,7.01263333 C51.8407719,8.1723 51.8074344,9.72396667 53.5083137,10.4509667 C55.6262451,11.3566333 57.5174814,9.7143 59.2126933,8.8553 C61.3809643,7.75663333 64.7120473,7.8773 66.7189648,8.8553 C68.4271783,9.68796667 70.3050797,11.3566333 72.4233444,10.4509667 C74.1242237,9.72396667 74.0908862,8.1723 73.1094302,7.01263333', id: 'Frame' })))));
+    };
+    Sunglasses.optionValue = 'Sunglasses';
+    return Sunglasses;
+}(React.Component));
+exports.default = Sunglasses;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Wayfarers.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Wayfarers.d.ts
new file mode 100644
index 000000000..14baf6f7d
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Wayfarers.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+export default class Wayfarers extends React.Component {
+    static optionValue: string;
+    private path1;
+    private path2;
+    private filter1;
+    private linearGradient1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Wayfarers.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Wayfarers.js
new file mode 100644
index 000000000..d8c4f163c
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/Wayfarers.js
@@ -0,0 +1,58 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Wayfarers = /** @class */ (function (_super) {
+    __extends(Wayfarers, _super);
+    function Wayfarers() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        _this.path2 = lodash_1.uniqueId('react-path-');
+        _this.filter1 = lodash_1.uniqueId('react-filter-');
+        _this.linearGradient1 = lodash_1.uniqueId('react-linear-gradient-');
+        return _this;
+    }
+    Wayfarers.prototype.render = function () {
+        var _a = this, path1 = _a.path1, path2 = _a.path2, filter1 = _a.filter1, linearGradient1 = _a.linearGradient1;
+        return (React.createElement("g", { id: 'Top/_Resources/Wayfarers', fill: 'none', transform: 'translate(62.000000, 85.000000)', strokeWidth: '1' },
+            React.createElement("defs", null,
+                React.createElement("filter", { x: '-0.8%', y: '-2.4%', width: '101.6%', height: '109.8%', filterUnits: 'objectBoundingBox', id: filter1 },
+                    React.createElement("feOffset", { dx: '0', dy: '2', in: 'SourceAlpha', result: 'shadowOffsetOuter1' }),
+                    React.createElement("feColorMatrix", { values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0', type: 'matrix', in: 'shadowOffsetOuter1', result: 'shadowMatrixOuter1' }),
+                    React.createElement("feMerge", null,
+                        React.createElement("feMergeNode", { in: 'shadowMatrixOuter1' }),
+                        React.createElement("feMergeNode", { in: 'SourceGraphic' }))),
+                React.createElement("linearGradient", { x1: '50%', y1: '0%', x2: '50%', y2: '100%', id: linearGradient1 },
+                    React.createElement("stop", { stopColor: '#FFFFFF', stopOpacity: '0.5', offset: '0%' }),
+                    React.createElement("stop", { stopColor: '#000000', stopOpacity: '0.5', offset: '70.5058195%' })),
+                React.createElement("path", { d: 'M44.9178864,17.5714286 C44.9178864,27.2737857 36.66775,35.1428571 22.9204545,35.1428571 L20.1704091,35.1428571 C6.42311364,35.1428571 0.923022727,27.2708571 0.923022727,17.5714286 L0.923022727,17.5714286 C0.923022727,7.86614286 2.20715909,0 21.4545455,0 L24.3863636,0 C43.63375,0 44.9178864,7.86614286 44.9178864,17.5714286 L44.9178864,17.5714286 Z', id: path1 }),
+                React.createElement("path", { d: 'M106.486068,17.5714286 C106.486068,27.2737857 98.2388636,35.1428571 84.4886364,35.1428571 L81.7385909,35.1428571 C67.9912955,35.1428571 62.4912045,27.2708571 62.4912045,17.5714286 L62.4912045,17.5714286 C62.4912045,7.86614286 63.7753409,0 83.0227273,0 L85.9545455,0 C105.199,0 106.486068,7.86614286 106.486068,17.5714286 L106.486068,17.5714286 Z', id: path2 })),
+            React.createElement("g", { id: 'Wayfarers', filter: "url(#" + filter1 + ")", transform: 'translate(7.000000, 7.000000)' },
+                React.createElement("g", { id: 'Shades', transform: 'translate(10.795455, 2.928571)', fillRule: 'nonzero' },
+                    React.createElement("g", { id: 'Shade' },
+                        React.createElement("use", { fillOpacity: '0.700000048', fill: '#000000', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+                        React.createElement("use", { fill: "url(#" + linearGradient1 + ")", fillRule: 'evenodd', style: { mixBlendMode: 'screen' }, xlinkHref: '#' + path1 })),
+                    React.createElement("g", { id: 'Shade' },
+                        React.createElement("use", { fillOpacity: '0.700000048', fill: '#000000', fillRule: 'evenodd', xlinkHref: '#' + path2 }),
+                        React.createElement("use", { fill: "url(#" + linearGradient1 + ")", fillRule: 'evenodd', style: { mixBlendMode: 'screen' }, xlinkHref: '#' + path2 }))),
+                React.createElement("path", { d: 'M33.7159091,41 L30.9658636,41 C17.0778409,41 8.78665909,33.3359286 8.78665909,20.5 C8.78665909,10.127 10.5985227,0 32.25,0 L35.1818182,0 C56.8332955,0 58.6451591,10.127 58.6451591,20.5 C58.6451591,32.5686429 48.3955227,41 33.7159091,41 Z M32.25,5.85421429 C14.6502955,5.85421429 14.6502955,12.3175714 14.6502955,20.5 C14.6502955,27.1800714 17.4795,35.1428571 30.9658636,35.1428571 L33.7159091,35.1428571 C44.9418409,35.1428571 52.7815227,29.1217143 52.7815227,20.5 C52.7815227,12.3175714 52.7815227,5.85421429 35.1818182,5.85421429 L32.25,5.85421429 Z', id: 'Left', fill: '#252C2F', fillRule: 'nonzero' }),
+                React.createElement("path", { d: 'M95.2840909,41 L92.5340455,41 C78.6460227,41 70.3548409,33.3359286 70.3548409,20.5 C70.3548409,10.127 72.1667045,0 93.8181818,0 L96.75,0 C118.401477,0 120.213341,10.127 120.213341,20.5 C120.213341,32.5686429 109.963705,41 95.2840909,41 Z M93.8181818,5.85421429 C76.2184773,5.85421429 76.2184773,12.3175714 76.2184773,20.5 C76.2184773,27.1800714 79.0506136,35.1428571 92.5340455,35.1428571 L95.2840909,35.1428571 C106.510023,35.1428571 114.349705,29.1217143 114.349705,20.5 C114.349705,12.3175714 114.349705,5.85421429 96.75,5.85421429 L93.8181818,5.85421429 Z', id: 'Right', fill: '#252C2F', fillRule: 'nonzero' }),
+                React.createElement("path", { d: 'M2.93181818,5.85714286 C3.61786364,5.17185714 11.1233182,0 32.25,0 C49.9640455,0 53.7138409,1.88014286 59.3898409,4.72085714 L59.8053162,4.93054903 C60.1999353,5.07314243 62.2179351,5.77419634 64.5784525,5.85128811 C66.7290156,5.75689949 68.5684809,5.16080623 69.1059926,4.96981137 C75.5844654,1.74762081 81.9260118,0 96.75,0 C117.876682,0 125.382136,5.17185714 126.068182,5.85714286 C127.689477,5.85714286 129,7.16621429 129,8.78571429 L129,11.7142857 C129,13.3337857 127.689477,14.6428571 126.068182,14.6428571 C126.068182,14.6428571 120.204545,14.6428571 120.204545,17.5714286 C120.204545,20.5 117.272727,13.3337857 117.272727,11.7142857 L117.272727,8.8618831 C113.697201,7.46243482 107.296654,5.85714286 96.75,5.85714286 C84.9995538,5.85714286 79.1475515,6.98813142 74.1276604,9.10414393 L74.1837955,9.24257143 L71.6878772,10.2500422 L74.1813177,11.2582547 L71.981173,16.6874536 L69.263564,15.5885995 C69.0208516,15.4904597 68.4971539,15.3141463 67.770994,15.1309826 C65.7466083,14.6203594 63.6653786,14.4649153 61.8248214,14.8513001 C61.1495627,14.993056 60.5230576,15.2057795 59.9480988,15.4931011 L57.3260941,16.8033836 L54.7026238,11.5651815 L57.3246285,10.2548989 L57.3310023,10.251716 L54.8191364,9.23671429 L54.8992448,9.03890561 C50.5700368,6.97578666 46.5781927,5.85714286 32.25,5.85714286 C21.7038986,5.85714286 15.3034993,7.46145875 11.7272727,8.86093383 L11.7272727,11.7142857 C11.7272727,13.3337857 8.79545455,20.5 8.79545455,17.5714286 C8.79545455,14.6428571 2.93181818,14.6428571 2.93181818,14.6428571 C1.31345455,14.6428571 0,13.3337857 0,11.7142857 L0,8.78571429 C0,7.16621429 1.31345455,5.85714286 2.93181818,5.85714286 Z', id: 'Stuff', fill: '#252C2F', fillRule: 'nonzero' }))));
+    };
+    Wayfarers.optionValue = 'Wayfarers';
+    return Wayfarers;
+}(React.Component));
+exports.default = Wayfarers;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/index.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/index.d.ts
new file mode 100644
index 000000000..398469988
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/index.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+export default class Accessories extends React.Component {
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/index.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/index.js
new file mode 100644
index 000000000..e7e3f7d82
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/accessories/index.js
@@ -0,0 +1,42 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Blank_1 = require("./Blank");
+var Kurt_1 = require("./Kurt");
+var Prescription01_1 = require("./Prescription01");
+var Prescription02_1 = require("./Prescription02");
+var Round_1 = require("./Round");
+var Sunglasses_1 = require("./Sunglasses");
+var Wayfarers_1 = require("./Wayfarers");
+var options_1 = require("../../../options");
+var Accessories = /** @class */ (function (_super) {
+    __extends(Accessories, _super);
+    function Accessories() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Accessories.prototype.render = function () {
+        return (React.createElement(options_1.Selector, { defaultOption: Blank_1.default, option: options_1.AccessoriesOption },
+            React.createElement(Blank_1.default, null),
+            React.createElement(Kurt_1.default, null),
+            React.createElement(Prescription01_1.default, null),
+            React.createElement(Prescription02_1.default, null),
+            React.createElement(Round_1.default, null),
+            React.createElement(Sunglasses_1.default, null),
+            React.createElement(Wayfarers_1.default, null)));
+    };
+    return Accessories;
+}(React.Component));
+exports.default = Accessories;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardLight.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardLight.d.ts
new file mode 100644
index 000000000..e815325fb
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardLight.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class BeardLight extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private path1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardLight.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardLight.js
new file mode 100644
index 000000000..a39c96603
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardLight.js
@@ -0,0 +1,40 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Colors_1 = require("./Colors");
+var BeardLight = /** @class */ (function (_super) {
+    __extends(BeardLight, _super);
+    function BeardLight() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    BeardLight.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, path1 = _a.path1;
+        return (React.createElement("g", { id: 'Facial-Hair/Beard-Light', transform: 'translate(49.000000, 72.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M101.428403,98.1685688 C98.9148372,100.462621 96.23722,101.494309 92.8529444,100.772863 C92.2705777,100.648833 89.8963391,96.2345713 83.9998344,96.2345713 C78.1033297,96.2345713 75.7294253,100.648833 75.1467245,100.772863 C71.7624488,101.494309 69.0848316,100.462621 66.5712661,98.1685688 C61.8461772,93.855604 57.9166219,87.9081858 60.2778299,81.4191814 C61.5083844,78.0369425 63.5097479,74.3237342 67.1506257,73.2459109 C71.0384163,72.0955419 76.4968931,73.2439051 80.4147542,72.4582708 C81.6840664,72.2035248 83.0706538,71.7508657 83.9998344,71 C84.929015,71.7508657 86.3159365,72.2035248 87.5845805,72.4582708 C91.5027758,73.2439051 96.9612525,72.0955419 100.849043,73.2459109 C104.489921,74.3237342 106.491284,78.0369425 107.722173,81.4191814 C110.083381,87.9081858 106.153826,93.855604 101.428403,98.1685688 M140.081033,26 C136.670693,34.4002532 137.987774,44.8580348 137.356666,53.6758724 C136.844038,60.8431942 135.33712,71.5857526 128.972858,76.214531 C125.718361,78.5816138 119.79436,82.5598986 115.54187,81.4501943 C112.614539,80.6863848 112.302182,72.290096 108.455284,69.1469801 C104.09172,65.5823153 98.6429854,64.0160432 93.1491481,64.2578722 C90.7785381,64.3622683 85.9841367,64.3374908 83.9999331,66.1604584 C82.0157295,64.3374908 77.2216647,64.3622683 74.8510547,64.2578722 C69.3568808,64.0160432 63.9081467,65.5823153 59.5445817,69.1469801 C55.6976839,72.290096 55.3856641,80.6863848 52.4583326,81.4501943 C48.2058427,82.5598986 42.2818421,78.5816138 39.0270077,76.214531 C32.6624096,71.5857526 31.1561652,60.8431942 30.642864,53.6758724 C30.0120926,44.8580348 31.3291729,34.4002532 27.9188335,26 C26.2597768,26 27.3540339,42.1288693 27.3540339,42.1288693 L27.3540339,62.4851205 C27.3856735,77.7732046 36.935095,100.655445 58.1080116,109.393004 C63.2861266,111.52982 75.0153111,115 83.9999331,115 C92.9845551,115 104.71374,111.860188 109.891855,109.723371 C131.064771,100.985813 140.614193,77.7732046 140.646169,62.4851205 L140.646169,42.1288693 C140.646169,42.1288693 141.740089,26 140.081033,26', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("use", { id: 'Lite-Beard', fill: '#331B0C', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+            React.createElement(Colors_1.default, { maskID: mask1 })));
+    };
+    BeardLight.optionValue = 'BeardLight';
+    return BeardLight;
+}(React.Component));
+exports.default = BeardLight;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMagestic.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMagestic.d.ts
new file mode 100644
index 000000000..df65e9405
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMagestic.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class BeardMagestic extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private path1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMagestic.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMagestic.js
new file mode 100644
index 000000000..dd68369ba
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMagestic.js
@@ -0,0 +1,40 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Colors_1 = require("./Colors");
+var BeardMagestic = /** @class */ (function (_super) {
+    __extends(BeardMagestic, _super);
+    function BeardMagestic() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    BeardMagestic.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, path1 = _a.path1;
+        return (React.createElement("g", { id: 'Facial-Hair/Beard-Magestic', transform: 'translate(49.000000, 72.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("use", { id: 'Glorious-Beard', fill: '#5E7AA9', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+            React.createElement(Colors_1.default, { maskID: mask1 })));
+    };
+    BeardMagestic.optionValue = 'BeardMagestic';
+    return BeardMagestic;
+}(React.Component));
+exports.default = BeardMagestic;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMajestic.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMajestic.d.ts
new file mode 100644
index 000000000..b0596d79a
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMajestic.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class BeardMajestic extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private path1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMajestic.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMajestic.js
new file mode 100644
index 000000000..284296047
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMajestic.js
@@ -0,0 +1,40 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Colors_1 = require("./Colors");
+var BeardMajestic = /** @class */ (function (_super) {
+    __extends(BeardMajestic, _super);
+    function BeardMajestic() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    BeardMajestic.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, path1 = _a.path1;
+        return (React.createElement("g", { id: 'Facial-Hair/Beard-Majestic', transform: 'translate(49.000000, 72.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("use", { id: 'Glorious-Beard', fill: '#5E7AA9', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+            React.createElement(Colors_1.default, { maskID: mask1 })));
+    };
+    BeardMajestic.optionValue = 'BeardMajestic';
+    return BeardMajestic;
+}(React.Component));
+exports.default = BeardMajestic;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMedium.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMedium.d.ts
new file mode 100644
index 000000000..358ae5ee5
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMedium.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class BeardMedium extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private path1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMedium.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMedium.js
new file mode 100644
index 000000000..baa1c0cfe
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/BeardMedium.js
@@ -0,0 +1,40 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Colors_1 = require("./Colors");
+var BeardMedium = /** @class */ (function (_super) {
+    __extends(BeardMedium, _super);
+    function BeardMedium() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    BeardMedium.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, path1 = _a.path1;
+        return (React.createElement("g", { id: 'Facial-Hair/Beard-Medium', transform: 'translate(49.000000, 72.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M105.017591,94.1296214 C101.150441,99.7213834 98.257542,95.9467308 94.1374777,92.8762163 C91.6567227,91.0272796 87.9608129,88.7275108 84.5044337,88.8410391 C81.0477114,88.7275108 77.3518016,91.0272796 74.8710466,92.8762163 C70.7509822,95.9467308 67.8580835,99.7213834 63.9909333,94.1296214 C61.0884259,89.9323547 62.3028943,82.8739117 65.014944,78.9027173 C68.8738581,73.2512381 74.1088724,75.9847769 79.9622738,75.3400279 C81.5538829,75.1648137 83.1526985,74.7228407 84.5044337,74 C85.856169,74.7228407 87.4546414,75.1648137 89.0462504,75.3400279 C94.899995,75.9847769 100.134666,73.2512381 103.993923,78.9027173 C106.70563,82.8739117 107.920098,89.9323547 105.017591,94.1296214 M140.39109,26 C136.966521,40.0748212 135.393023,54.4337754 132.909944,68.6711471 C132.392536,71.6390145 131.826063,74.5963095 131.224594,77.5496398 C131.098329,78.1697764 130.973781,80.4725746 130.362704,80.7643064 C128.511632,81.6484223 124.739149,76.9466834 123.730409,75.8851496 C121.196893,73.219256 118.684993,70.5292442 115.599415,68.437233 C109.364783,64.2102603 102.065485,61.7108818 94.4700836,61.117837 C91.2922091,60.8693859 86.9951134,61.3025234 84.000116,63.1104016 C81.0051185,61.3025234 76.7080229,60.8693859 73.5298053,61.117837 C65.9344039,61.7108818 58.6351055,64.2102603 52.4004739,68.437233 C49.3148957,70.5292442 46.8033387,73.219256 44.2694796,75.8851496 C43.2607395,76.9466834 39.4882573,81.6484223 37.6371849,80.7643064 C37.0261079,80.4725746 36.9015594,78.1697764 36.7752954,77.5496398 C36.1738255,74.5963095 35.6073527,71.6390145 35.0899445,68.6711471 C32.6072086,54.4337754 31.0337113,40.0748212 27.6091415,26 C26.6127533,26 25.7385119,44.7478165 25.6273446,46.4945731 C25.174784,53.5889755 24.6463963,60.5254529 25.3216346,67.6261326 C26.485803,79.8749043 27.6993791,95.2339402 37.032627,104.58753 C45.4659003,113.039493 57.7103052,114.806417 68.2713185,120.141327 C69.631059,120.828202 71.4347824,121.676306 73.3798667,122.37111 C75.4289129,123.934171 79.4926946,125 84.1740722,125 C89.0846465,125 93.3155222,123.827456 95.2540874,122.137856 C96.9548781,121.49261 98.5180822,120.752874 99.7285704,120.141327 C110.288776,114.805245 122.533989,113.039493 130.967262,104.58753 C140.30051,95.2339402 141.514086,79.8749043 142.678597,67.6261326 C143.353493,60.5254529 142.825105,53.5889755 142.372887,46.4945731 C142.261377,44.7478165 141.387136,26 140.39109,26 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("use", { id: 'Beardness', fill: '#252E32', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+            React.createElement(Colors_1.default, { maskID: mask1 })));
+    };
+    BeardMedium.optionValue = 'BeardMedium';
+    return BeardMedium;
+}(React.Component));
+exports.default = BeardMedium;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/Blank.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/Blank.d.ts
new file mode 100644
index 000000000..998ae7c80
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/Blank.d.ts
@@ -0,0 +1,5 @@
+import * as React from 'react';
+export default class Blank extends React.Component {
+    static optionValue: string;
+    render(): null;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/Blank.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/Blank.js
new file mode 100644
index 000000000..29335bbc7
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/Blank.js
@@ -0,0 +1,28 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Blank = /** @class */ (function (_super) {
+    __extends(Blank, _super);
+    function Blank() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Blank.prototype.render = function () {
+        return null;
+    };
+    Blank.optionValue = 'Blank';
+    return Blank;
+}(React.Component));
+exports.default = Blank;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/Colors.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/Colors.d.ts
new file mode 100644
index 000000000..de3fcf1d9
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/Colors.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export interface Props {
+    maskID: string;
+}
+export default class Colors extends React.Component<Props> {
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/Colors.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/Colors.js
new file mode 100644
index 000000000..da72a0d04
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/Colors.js
@@ -0,0 +1,62 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var options_1 = require("../../../options");
+function makeColor(name, color) {
+    var ColorComponent = /** @class */ (function (_super) {
+        __extends(ColorComponent, _super);
+        function ColorComponent() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        ColorComponent.prototype.render = function () {
+            return (React.createElement("g", { id: 'Color/Hair/Brown', mask: "url(#" + this.props.maskID + ")", fill: color },
+                React.createElement("g", { transform: 'translate(-32.000000, 0.000000)', id: 'Color' },
+                    React.createElement("rect", { x: '0', y: '0', width: '264', height: '244' }))));
+        };
+        return ColorComponent;
+    }(React.Component));
+    var anyComponent = ColorComponent;
+    anyComponent.displayName = name;
+    anyComponent.optionValue = name;
+    return anyComponent;
+}
+var Auburn = makeColor('Auburn', '#A55728');
+var Black = makeColor('Black', '#2C1B18');
+var Blonde = makeColor('Blonde', '#B58143');
+var BlondeGolden = makeColor('BlondeGolden', '#D6B370');
+var Brown = makeColor('Brown', '#724133');
+var BrownDark = makeColor('BrownDark', '#4A312C');
+var Platinum = makeColor('Platinum', '#ECDCBF');
+var Red = makeColor('Red', '#C93305');
+var Colors = /** @class */ (function (_super) {
+    __extends(Colors, _super);
+    function Colors() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Colors.prototype.render = function () {
+        return (React.createElement(options_1.Selector, { option: options_1.FacialHairColor, defaultOption: BrownDark },
+            React.createElement(Auburn, { maskID: this.props.maskID }),
+            React.createElement(Black, { maskID: this.props.maskID }),
+            React.createElement(Blonde, { maskID: this.props.maskID }),
+            React.createElement(BlondeGolden, { maskID: this.props.maskID }),
+            React.createElement(Brown, { maskID: this.props.maskID }),
+            React.createElement(BrownDark, { maskID: this.props.maskID }),
+            React.createElement(Platinum, { maskID: this.props.maskID }),
+            React.createElement(Red, { maskID: this.props.maskID })));
+    };
+    return Colors;
+}(React.Component));
+exports.default = Colors;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/MoustacheFancy.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/MoustacheFancy.d.ts
new file mode 100644
index 000000000..844e09f10
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/MoustacheFancy.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class MoustacheFancy extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private path1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/MoustacheFancy.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/MoustacheFancy.js
new file mode 100644
index 000000000..b6473d2e9
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/MoustacheFancy.js
@@ -0,0 +1,40 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Colors_1 = require("./Colors");
+var MoustacheFancy = /** @class */ (function (_super) {
+    __extends(MoustacheFancy, _super);
+    function MoustacheFancy() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    MoustacheFancy.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, path1 = _a.path1;
+        return (React.createElement("g", { id: 'Facial-Hair/Moustache-Fancy', transform: 'translate(49.000000, 72.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M84.0002865,69.2970648 C77.2083681,65.7112456 67.5782013,65.1489138 62.3885276,67.1316942 C56.6144416,69.3374281 51.5052994,75.5829845 42.6388201,72.8283797 C42.2699314,72.7136458 41.9094725,73.0449523 42.0204089,73.408662 C43.3937943,77.9183313 51.0278347,81.0068878 53.6221945,81.1080652 C64.961124,81.549609 74.0949802,72.8302891 84.0002865,72.1614794 C93.9055921,72.8302891 103.03945,81.549609 114.378714,81.1080652 C116.972736,81.0068878 124.607113,77.9183313 125.980498,73.408662 C126.091098,73.0449523 125.730639,72.7136458 125.36175,72.8283797 C116.495271,75.5829845 111.386129,69.3374281 105.612044,67.1316942 C100.422371,65.1489138 90.7922044,65.7112456 84.0002865,69.2970648 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("use", { id: 'Moustache-U-a-Question', fill: '#28354B', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+            React.createElement(Colors_1.default, { maskID: mask1 })));
+    };
+    MoustacheFancy.optionValue = 'MoustacheFancy';
+    return MoustacheFancy;
+}(React.Component));
+exports.default = MoustacheFancy;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/MoustacheMagnum.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/MoustacheMagnum.d.ts
new file mode 100644
index 000000000..109e5609d
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/MoustacheMagnum.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+export default class MoustacheMagnum extends React.Component {
+    static optionValue: string;
+    private mask1;
+    private path1;
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/MoustacheMagnum.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/MoustacheMagnum.js
new file mode 100644
index 000000000..3fbccd481
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/MoustacheMagnum.js
@@ -0,0 +1,40 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var lodash_1 = require("lodash");
+var Colors_1 = require("./Colors");
+var MoustacheMagnum = /** @class */ (function (_super) {
+    __extends(MoustacheMagnum, _super);
+    function MoustacheMagnum() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.mask1 = lodash_1.uniqueId('react-mask-');
+        _this.path1 = lodash_1.uniqueId('react-path-');
+        return _this;
+    }
+    MoustacheMagnum.prototype.render = function () {
+        var _a = this, mask1 = _a.mask1, path1 = _a.path1;
+        return (React.createElement("g", { id: 'Facial-Hair/Moustache-Magnum', transform: 'translate(49.000000, 72.000000)' },
+            React.createElement("defs", null,
+                React.createElement("path", { d: 'M83.9980103,74.839711 C83.4569991,75.6087366 82.761047,76.2496937 81.949688,76.6891498 C73.0477917,81.5102869 63.8767499,77.3322546 58.8763101,77.6298353 C56.459601,77.7739966 53.3405442,79.4153191 52.2155358,77.6791014 C50.9768736,75.7669804 55.0680827,65.2207224 64.7214121,63.4643353 C71.7310704,62.1893309 81.4972391,63.6024033 83.9980103,66.9380109 C86.4987814,63.6024033 96.2649453,62.1893309 103.274279,63.4643353 C112.927938,65.2207224 117.019147,75.7669804 115.780485,77.6791014 C114.655476,79.4153191 111.53642,77.7739966 109.119711,77.6298353 C104.118941,77.3322546 94.948229,81.5102869 86.0463327,76.6891498 C85.2349736,76.2496937 84.5390216,75.6087366 83.9980103,74.839711 Z', id: path1 })),
+            React.createElement("mask", { id: mask1, fill: 'white' },
+                React.createElement("use", { xlinkHref: '#' + path1 })),
+            React.createElement("use", { id: 'Hey...', fill: '#28354B', fillRule: 'evenodd', xlinkHref: '#' + path1 }),
+            React.createElement(Colors_1.default, { maskID: mask1 })));
+    };
+    MoustacheMagnum.optionValue = 'MoustacheMagnum';
+    return MoustacheMagnum;
+}(React.Component));
+exports.default = MoustacheMagnum;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/index.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/index.d.ts
new file mode 100644
index 000000000..61c677833
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/index.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+export default class FacialHair extends React.Component {
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/index.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/index.js
new file mode 100644
index 000000000..8b17f67e5
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/facialHair/index.js
@@ -0,0 +1,40 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var BeardLight_1 = require("./BeardLight");
+var BeardMajestic_1 = require("./BeardMajestic");
+var BeardMedium_1 = require("./BeardMedium");
+var Blank_1 = require("./Blank");
+var MoustacheFancy_1 = require("./MoustacheFancy");
+var MoustacheMagnum_1 = require("./MoustacheMagnum");
+var options_1 = require("../../../options");
+var FacialHair = /** @class */ (function (_super) {
+    __extends(FacialHair, _super);
+    function FacialHair() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    FacialHair.prototype.render = function () {
+        return (React.createElement(options_1.Selector, { option: options_1.FacialHairOption, defaultOption: Blank_1.default },
+            React.createElement(Blank_1.default, null),
+            React.createElement(BeardMedium_1.default, null),
+            React.createElement(BeardLight_1.default, null),
+            React.createElement(BeardMajestic_1.default, null),
+            React.createElement(MoustacheFancy_1.default, null),
+            React.createElement(MoustacheMagnum_1.default, null)));
+    };
+    return FacialHair;
+}(React.Component));
+exports.default = FacialHair;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/index.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/index.d.ts
new file mode 100644
index 000000000..b4e22aff2
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/index.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+export default class Top extends React.Component {
+    render(): JSX.Element;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/index.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/index.js
new file mode 100644
index 000000000..e72fa4084
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/avatar/top/index.js
@@ -0,0 +1,99 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
+var Eyepatch_1 = require("./Eyepatch");
+var Hat_1 = require("./Hat");
+var Hijab_1 = require("./Hijab");
+var LongHairBigHair_1 = require("./LongHairBigHair");
+var LongHairBob_1 = require("./LongHairBob");
+var LongHairBun_1 = require("./LongHairBun");
+var LongHairCurly_1 = require("./LongHairCurly");
+var LongHairCurvy_1 = require("./LongHairCurvy");
+var LongHairDreads_1 = require("./LongHairDreads");
+var LongHairFrida_1 = require("./LongHairFrida");
+var LongHairFro_1 = require("./LongHairFro");
+var LongHairFroBand_1 = require("./LongHairFroBand");
+var LongHairMiaWallace_1 = require("./LongHairMiaWallace");
+var LongHairNotTooLong_1 = require("./LongHairNotTooLong");
+var LongHairShavedSides_1 = require("./LongHairShavedSides");
+var LongHairStraight_1 = require("./LongHairStraight");
+var LongHairStraight2_1 = require("./LongHairStraight2");
+var LongHairStraightStrand_1 = require("./LongHairStraightStrand");
+var NoHair_1 = require("./NoHair");
+var ShortHairDreads01_1 = require("./ShortHairDreads01");
+var ShortHairDreads02_1 = require("./ShortHairDreads02");
+var ShortHairFrizzle_1 = require("./ShortHairFrizzle");
+var ShortHairShaggyMullet_1 = require("./ShortHairShaggyMullet");
+var ShortHairShortCurly_1 = require("./ShortHairShortCurly");
+var ShortHairShortFlat_1 = require("./ShortHairShortFlat");
+var ShortHairShortRound_1 = require("./ShortHairShortRound");
+var ShortHairShortWaved_1 = require("./ShortHairShortWaved");
+var ShortHairSides_1 = require("./ShortHairSides");
+var ShortHairTheCaesar_1 = require("./ShortHairTheCaesar");
+var ShortHairTheCaesarSidePart_1 = require("./ShortHairTheCaesarSidePart");
+var Turban_1 = require("./Turban");
+var WinterHat1_1 = require("./WinterHat1");
+var WinterHat2_1 = require("./WinterHat2");
+var WinterHat3_1 = require("./WinterHat3");
+var WinterHat4_1 = require("./WinterHat4");
+var options_1 = require("../../options");
+var Top = /** @class */ (function (_super) {
+    __extends(Top, _super);
+    function Top() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Top.prototype.render = function () {
+        var children = this.props.children;
+        return (React.createElement(options_1.Selector, { defaultOption: LongHairStraight_1.default, option: options_1.TopOption },
+            React.createElement(NoHair_1.default, null, children),
+            React.createElement(Eyepatch_1.default, null, children),
+            React.createElement(Hat_1.default, null, children),
+            React.createElement(Hijab_1.default, null, children),
+            React.createElement(Turban_1.default, null, children),
+            React.createElement(WinterHat1_1.default, null, children),
+            React.createElement(WinterHat2_1.default, null, children),
+            React.createElement(WinterHat3_1.default, null, children),
+            React.createElement(WinterHat4_1.default, null, children),
+            React.createElement(LongHairBigHair_1.default, null, children),
+            React.createElement(LongHairBob_1.default, null, children),
+            React.createElement(LongHairBun_1.default, null, children),
+            React.createElement(LongHairCurly_1.default, null, children),
+            React.createElement(LongHairCurvy_1.default, null, children),
+            React.createElement(LongHairDreads_1.default, null, children),
+            React.createElement(LongHairFrida_1.default, null, children),
+            React.createElement(LongHairFro_1.default, null, children),
+            React.createElement(LongHairFroBand_1.default, null, children),
+            React.createElement(LongHairNotTooLong_1.default, null, children),
+            React.createElement(LongHairShavedSides_1.default, null, children),
+            React.createElement(LongHairMiaWallace_1.default, null, children),
+            React.createElement(LongHairStraight_1.default, null, children),
+            React.createElement(LongHairStraight2_1.default, null, children),
+            React.createElement(LongHairStraightStrand_1.default, null, children),
+            React.createElement(ShortHairDreads01_1.default, null, children),
+            React.createElement(ShortHairDreads02_1.default, null, children),
+            React.createElement(ShortHairFrizzle_1.default, null, children),
+            React.createElement(ShortHairShaggyMullet_1.default, null, children),
+            React.createElement(ShortHairShortCurly_1.default, null, children),
+            React.createElement(ShortHairShortFlat_1.default, null, children),
+            React.createElement(ShortHairShortRound_1.default, null, children),
+            React.createElement(ShortHairShortWaved_1.default, null, children),
+            React.createElement(ShortHairSides_1.default, null, children),
+            React.createElement(ShortHairTheCaesar_1.default, null, children),
+            React.createElement(ShortHairTheCaesarSidePart_1.default, null, children)));
+    };
+    return Top;
+}(React.Component));
+exports.default = Top;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/index.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/index.d.ts
new file mode 100644
index 000000000..46fa409b1
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/index.d.ts
@@ -0,0 +1,49 @@
+import * as PropTypes from 'prop-types';
+import * as React from 'react';
+import { OptionContext } from './options';
+export { default as Avatar, AvatarStyle } from './avatar';
+export { Option, OptionContext, allOptions } from './options';
+export interface Props {
+    avatarStyle: string;
+    style?: React.CSSProperties;
+    topType?: string;
+    accessoriesType?: string;
+    hairColor?: string;
+    facialHairType?: string;
+    facialHairColor?: string;
+    clotheType?: string;
+    clotheColor?: string;
+    graphicType?: string;
+    eyeType?: string;
+    eyebrowType?: string;
+    mouthType?: string;
+    skinColor?: string;
+    pieceType?: string;
+    pieceSize?: string;
+}
+export default class AvatarComponent extends React.Component<Props> {
+    static childContextTypes: {
+        optionContext: PropTypes.Requireable<OptionContext>;
+    };
+    private optionContext;
+    getChildContext(): {
+        optionContext: OptionContext;
+    };
+    UNSAFE_componentWillMount(): void;
+    componentWillReceiveProps(nextProps: Props): void;
+    render(): JSX.Element;
+    private updateOptionContext;
+}
+export declare class Piece extends React.Component<Props> {
+    static childContextTypes: {
+        optionContext: PropTypes.Requireable<OptionContext>;
+    };
+    private optionContext;
+    getChildContext(): {
+        optionContext: OptionContext;
+    };
+    UNSAFE_componentWillMount(): void;
+    componentWillReceiveProps(nextProps: Props): void;
+    render(): JSX.Element;
+    private updateOptionContext;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/index.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/index.js
new file mode 100644
index 000000000..ef8214898
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/index.js
@@ -0,0 +1,103 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var PropTypes = require("prop-types");
+var React = require("react");
+var avatar_1 = require("./avatar");
+var options_1 = require("./options");
+var avatar_2 = require("./avatar");
+exports.Avatar = avatar_2.default;
+exports.AvatarStyle = avatar_2.AvatarStyle;
+var options_2 = require("./options");
+exports.Option = options_2.Option;
+exports.OptionContext = options_2.OptionContext;
+exports.allOptions = options_2.allOptions;
+var piece_1 = require("./avatar/piece");
+var AvatarComponent = /** @class */ (function (_super) {
+    __extends(AvatarComponent, _super);
+    function AvatarComponent() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.optionContext = new options_1.OptionContext(options_1.allOptions);
+        return _this;
+    }
+    AvatarComponent.prototype.getChildContext = function () {
+        return { optionContext: this.optionContext };
+    };
+    AvatarComponent.prototype.UNSAFE_componentWillMount = function () {
+        this.updateOptionContext(this.props);
+    };
+    AvatarComponent.prototype.componentWillReceiveProps = function (nextProps) {
+        this.updateOptionContext(nextProps);
+    };
+    AvatarComponent.prototype.render = function () {
+        var _a = this.props, avatarStyle = _a.avatarStyle, style = _a.style;
+        return React.createElement(avatar_1.default, { avatarStyle: avatarStyle, style: style });
+    };
+    AvatarComponent.prototype.updateOptionContext = function (props) {
+        var data = {};
+        for (var _i = 0, allOptions_1 = options_1.allOptions; _i < allOptions_1.length; _i++) {
+            var option = allOptions_1[_i];
+            var value = props[option.key];
+            if (!value) {
+                continue;
+            }
+            data[option.key] = value;
+        }
+        this.optionContext.setData(data);
+    };
+    AvatarComponent.childContextTypes = {
+        optionContext: PropTypes.instanceOf(options_1.OptionContext)
+    };
+    return AvatarComponent;
+}(React.Component));
+exports.default = AvatarComponent;
+var Piece = /** @class */ (function (_super) {
+    __extends(Piece, _super);
+    function Piece() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.optionContext = new options_1.OptionContext(options_1.allOptions);
+        return _this;
+    }
+    Piece.prototype.getChildContext = function () {
+        return { optionContext: this.optionContext };
+    };
+    Piece.prototype.UNSAFE_componentWillMount = function () {
+        this.updateOptionContext(this.props);
+    };
+    Piece.prototype.componentWillReceiveProps = function (nextProps) {
+        this.updateOptionContext(nextProps);
+    };
+    Piece.prototype.render = function () {
+        var _a = this.props, avatarStyle = _a.avatarStyle, style = _a.style, pieceType = _a.pieceType, pieceSize = _a.pieceSize;
+        return React.createElement(piece_1.default, { avatarStyle: avatarStyle, style: style, pieceType: pieceType, pieceSize: pieceSize });
+    };
+    Piece.prototype.updateOptionContext = function (props) {
+        var data = {};
+        for (var _i = 0, allOptions_2 = options_1.allOptions; _i < allOptions_2.length; _i++) {
+            var option = allOptions_2[_i];
+            var value = props[option.key];
+            if (!value) {
+                continue;
+            }
+            data[option.key] = value;
+        }
+        this.optionContext.setData(data);
+    };
+    Piece.childContextTypes = {
+        optionContext: PropTypes.instanceOf(options_1.OptionContext)
+    };
+    return Piece;
+}(React.Component));
+exports.Piece = Piece;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/Option.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/Option.d.ts
new file mode 100644
index 000000000..a3ddfe661
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/Option.d.ts
@@ -0,0 +1,10 @@
+export default class Option {
+    private _key;
+    private _label;
+    readonly key: string;
+    readonly label: string;
+    constructor({ key, label }: {
+        key: string;
+        label: string;
+    });
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/Option.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/Option.js
new file mode 100644
index 000000000..59935ef35
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/Option.js
@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var Option = /** @class */ (function () {
+    function Option(_a) {
+        var key = _a.key, label = _a.label;
+        this._key = key;
+        this._label = label;
+    }
+    Object.defineProperty(Option.prototype, "key", {
+        get: function () {
+            return this._key;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(Option.prototype, "label", {
+        get: function () {
+            return this._label;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return Option;
+}());
+exports.default = Option;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/OptionContext.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/OptionContext.d.ts
new file mode 100644
index 000000000..29ea124b7
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/OptionContext.d.ts
@@ -0,0 +1,36 @@
+import Option from './Option';
+export interface OptionState {
+    key: string;
+    options: Array<string>;
+    defaultValue?: string;
+    available: number;
+}
+export declare type OptionContextState = {
+    [index: string]: OptionState;
+};
+export default class OptionContext {
+    private stateChangeListeners;
+    private valueChangeListeners;
+    private _state;
+    private _data;
+    private readonly _options;
+    readonly options: Option[];
+    readonly state: OptionContextState;
+    constructor(options: Array<Option>);
+    addStateChangeListener(listener: () => void): void;
+    removeStateChangeListener(listener: () => void): void;
+    addValueChangeListener(listener: (key: string, value: string) => void): void;
+    removeValueChangeListener(listener: (key: string, value: string) => void): void;
+    optionEnter(key: string): void;
+    optionExit(key: string): void;
+    getOptionState(key: string): OptionState | null;
+    getValue(key: string): string | null;
+    setValue(key: string, value: string): void;
+    setData(data: {
+        [index: string]: string;
+    }): void;
+    setDefaultValue(key: string, defaultValue: string): void;
+    setOptions(key: string, options: Array<string>): void;
+    private setState;
+    private notifyListener;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/OptionContext.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/OptionContext.js
new file mode 100644
index 000000000..e9e54531b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/OptionContext.js
@@ -0,0 +1,122 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var OptionContext = /** @class */ (function () {
+    function OptionContext(options) {
+        this.stateChangeListeners = new Set();
+        this.valueChangeListeners = new Set();
+        this._state = {};
+        this._data = {};
+        this._options = options;
+        for (var _i = 0, options_1 = options; _i < options_1.length; _i++) {
+            var option = options_1[_i];
+            this._state[option.key] = {
+                key: option.key,
+                available: 0,
+                options: []
+            };
+        }
+    }
+    Object.defineProperty(OptionContext.prototype, "options", {
+        get: function () {
+            return this._options;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(OptionContext.prototype, "state", {
+        get: function () {
+            return this._state;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    OptionContext.prototype.addStateChangeListener = function (listener) {
+        this.stateChangeListeners.add(listener);
+    };
+    OptionContext.prototype.removeStateChangeListener = function (listener) {
+        this.stateChangeListeners.delete(listener);
+    };
+    OptionContext.prototype.addValueChangeListener = function (listener) {
+        this.valueChangeListeners.add(listener);
+    };
+    OptionContext.prototype.removeValueChangeListener = function (listener) {
+        this.valueChangeListeners.delete(listener);
+    };
+    OptionContext.prototype.optionEnter = function (key) {
+        var _a;
+        // TODO:
+        var optionState = this.getOptionState(key);
+        this.setState((_a = {},
+            _a[key] = __assign({}, optionState, { available: optionState.available + 1 }),
+            _a));
+    };
+    OptionContext.prototype.optionExit = function (key) {
+        var _a;
+        var optionState = this.getOptionState(key);
+        this.setState((_a = {},
+            _a[key] = __assign({}, optionState, { available: optionState.available - 1 }),
+            _a));
+    };
+    OptionContext.prototype.getOptionState = function (key) {
+        return this.state[key] || null;
+    };
+    OptionContext.prototype.getValue = function (key) {
+        var optionState = this.getOptionState(key);
+        if (!optionState) {
+            return null;
+        }
+        var value = this._data[key];
+        if (value) {
+            return value;
+        }
+        return optionState.defaultValue || null;
+    };
+    OptionContext.prototype.setValue = function (key, value) {
+        for (var _i = 0, _a = Array.from(this.valueChangeListeners); _i < _a.length; _i++) {
+            var listener = _a[_i];
+            listener(key, value);
+        }
+    };
+    // set single source of truth
+    OptionContext.prototype.setData = function (data) {
+        this._data = data;
+        this.notifyListener();
+    };
+    OptionContext.prototype.setDefaultValue = function (key, defaultValue) {
+        var _a;
+        var optionState = this.getOptionState(key);
+        this.setState((_a = {},
+            _a[key] = __assign({}, optionState, { defaultValue: defaultValue }),
+            _a));
+    };
+    OptionContext.prototype.setOptions = function (key, options) {
+        var _a;
+        this.setState((_a = {},
+            _a[key] = __assign({}, this.state[key], { key: key,
+                options: options }),
+            _a));
+    };
+    OptionContext.prototype.setState = function (state) {
+        this._state = __assign({}, this.state, state);
+        this.notifyListener();
+    };
+    OptionContext.prototype.notifyListener = function () {
+        for (var _i = 0, _a = Array.from(this.stateChangeListeners); _i < _a.length; _i++) {
+            var listener = _a[_i];
+            listener();
+        }
+    };
+    return OptionContext;
+}());
+exports.default = OptionContext;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/Selector.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/Selector.d.ts
new file mode 100644
index 000000000..d73ff4d85
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/Selector.d.ts
@@ -0,0 +1,22 @@
+import * as PropTypes from 'prop-types';
+import * as React from 'react';
+import Option from './Option';
+import OptionContext from './OptionContext';
+export interface Props {
+    option: Option;
+    defaultOption: React.ComponentClass | string;
+}
+export default class Selector extends React.Component<Props> {
+    static contextTypes: {
+        optionContext: PropTypes.Requireable<OptionContext>;
+    };
+    private readonly optionContext;
+    componentWillMount(): void;
+    componentWillUpdate(nextProps: Props & {
+        children?: React.ReactNode;
+    }): void;
+    componentWillUnmount(): void;
+    render(): null;
+    private optionContextUpdate;
+    private updateOptionValues;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/Selector.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/Selector.js
new file mode 100644
index 000000000..7619d2cd5
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/Selector.js
@@ -0,0 +1,91 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var PropTypes = require("prop-types");
+var React = require("react");
+var OptionContext_1 = require("./OptionContext");
+function getComponentOptionValue(component) {
+    var optionValue = component.optionValue;
+    if (!optionValue) {
+        throw new Error("optionValue should be provided for " + component);
+    }
+    return optionValue;
+}
+var Selector = /** @class */ (function (_super) {
+    __extends(Selector, _super);
+    function Selector() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.optionContextUpdate = function () {
+            _this.forceUpdate();
+        };
+        return _this;
+    }
+    Object.defineProperty(Selector.prototype, "optionContext", {
+        get: function () {
+            return this.context.optionContext;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Selector.prototype.componentDidMount = function () {
+        var _a = this.props, option = _a.option, defaultOption = _a.defaultOption;
+        var optionContext = this.optionContext;
+        var defaultValue = (typeof defaultOption === 'string' ?
+            defaultOption : getComponentOptionValue(defaultOption));
+        optionContext.addStateChangeListener(this.optionContextUpdate);
+        optionContext.optionEnter(option.key);
+        var optionState = optionContext.getOptionState(option.key);
+        this.updateOptionValues();
+        if (optionState) {
+            optionContext.setDefaultValue(option.key, defaultValue);
+        }
+    };
+    Selector.prototype.componentWillUpdate = function (nextProps) {
+        this.updateOptionValues(nextProps);
+    };
+    Selector.prototype.componentWillUnmount = function () {
+        this.optionContext.removeStateChangeListener(this.optionContextUpdate);
+        this.optionContext.optionExit(this.props.option.key);
+    };
+    Selector.prototype.render = function () {
+        var result = null;
+        var _a = this.props, option = _a.option, children = _a.children;
+        var value = this.optionContext.getValue(option.key);
+        React.Children.forEach(children, function (child) {
+            if (getComponentOptionValue(child.type) === value) {
+                result = child;
+            }
+        });
+        return result;
+    };
+    Selector.prototype.updateOptionValues = function (nextProps) {
+        if (nextProps && this.props.children === nextProps.children) {
+            return;
+        }
+        var _a = this.props, option = _a.option, children = _a.children;
+        var values = React.Children.map(children, 
+        // TODO: also validate and throw error if we don't see optionValue
+        function (child) { return getComponentOptionValue(child.type); });
+        if (new Set(values).size !== values.length) {
+            throw new Error('Duplicate values');
+        }
+        this.optionContext.setOptions(option.key, values);
+    };
+    Selector.contextTypes = {
+        optionContext: PropTypes.instanceOf(OptionContext_1.default)
+    };
+    return Selector;
+}(React.Component));
+exports.default = Selector;
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/index.d.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/index.d.ts
new file mode 100644
index 000000000..6a9a57bae
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/index.d.ts
@@ -0,0 +1,18 @@
+import Option from './Option';
+export { default as Option } from './Option';
+export { default as OptionContext, OptionContextState } from './OptionContext';
+export { default as Selector } from './Selector';
+export declare const TopOption: Option;
+export declare const AccessoriesOption: Option;
+export declare const HatColorOption: Option;
+export declare const HairColorOption: Option;
+export declare const FacialHairOption: Option;
+export declare const FacialHairColor: Option;
+export declare const ClotheOption: Option;
+export declare const ClotheColorOption: Option;
+export declare const GraphicOption: Option;
+export declare const EyesOption: Option;
+export declare const EyebrowOption: Option;
+export declare const MouthOption: Option;
+export declare const SkinOption: Option;
+export declare const allOptions: Option[];
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/index.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/index.js
new file mode 100644
index 000000000..176ccf1bf
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/index.js
@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var Option_1 = require("./Option");
+var Option_2 = require("./Option");
+exports.Option = Option_2.default;
+var OptionContext_1 = require("./OptionContext");
+exports.OptionContext = OptionContext_1.default;
+var Selector_1 = require("./Selector");
+exports.Selector = Selector_1.default;
+exports.TopOption = new Option_1.default({
+    key: 'topType',
+    label: 'Top',
+});
+exports.AccessoriesOption = new Option_1.default({
+    key: 'accessoriesType',
+    label: '↳ 👓 Accessories',
+});
+exports.HatColorOption = new Option_1.default({
+    key: 'hatColor',
+    label: '🎨 HatColor',
+});
+exports.HairColorOption = new Option_1.default({
+    key: 'hairColor',
+    label: '↳ 💈 Hair Color',
+});
+exports.FacialHairOption = new Option_1.default({
+    key: 'facialHairType',
+    label: 'Facial Hair',
+});
+exports.FacialHairColor = new Option_1.default({
+    key: 'facialHairColor',
+    label: '↳ ✂️ Facial Hair Color',
+});
+exports.ClotheOption = new Option_1.default({
+    key: 'clotheType',
+    label: '👔 Clothes',
+});
+exports.ClotheColorOption = new Option_1.default({
+    key: 'clotheColor',
+    label: '↳ Color Fabric',
+});
+exports.GraphicOption = new Option_1.default({
+    key: 'graphicType',
+    label: '↳ Graphic',
+});
+exports.EyesOption = new Option_1.default({
+    key: 'eyeType',
+    label: '👁 Eyes',
+});
+exports.EyebrowOption = new Option_1.default({
+    key: 'eyebrowType',
+    label: '✏️ Eyebrow',
+});
+exports.MouthOption = new Option_1.default({
+    key: 'mouthType',
+    label: '👄 Mouth',
+});
+exports.SkinOption = new Option_1.default({
+    key: 'skinColor',
+    label: '🎨 Skin',
+});
+exports.allOptions = [
+    exports.TopOption,
+    exports.AccessoriesOption,
+    exports.HatColorOption,
+    exports.HairColorOption,
+    exports.FacialHairOption,
+    exports.FacialHairColor,
+    exports.ClotheOption,
+    exports.ClotheColorOption,
+    exports.GraphicOption,
+    exports.EyesOption,
+    exports.EyebrowOption,
+    exports.MouthOption,
+    exports.SkinOption,
+];
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/withOptions.js b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/withOptions.js
new file mode 100644
index 000000000..3166e1d2c
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/dist/options/withOptions.js
@@ -0,0 +1,25 @@
+import * as PropTypes from 'prop-types';
+import * as React from 'react';
+import OptionContext from './OptionContext';
+export default function withOptions(Component, config) {
+    return _a = class ComponentWithOptions extends React.Component {
+            get optionContext() {
+                return this.context.optionContext;
+            }
+            componentDidMount() {
+                //
+            }
+            componentWillUnmount() {
+                //
+            }
+            render() {
+                const { props } = this;
+                return React.createElement(Component, Object.assign({}, props));
+            }
+        },
+        _a.contextTypes = {
+            optionContext: PropTypes.instanceOf(OptionContext)
+        },
+        _a;
+    var _a;
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/package.json b/src/components/Glutenbuddy/avataaars-lib/avataaars/package.json
new file mode 100644
index 000000000..168691db8
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/package.json
@@ -0,0 +1,74 @@
+{
+  "_from": "avataaars@^1.2.1",
+  "_id": "avataaars@1.2.1",
+  "_inBundle": false,
+  "_integrity": "sha512-4MmcXx3EKGwkKqEtVRiKxM08MMib2KYC1o5DcotpLUVuoe5EkWNuhJVB2JAH753II4VzMK7fO2EA5rf5QirPQg==",
+  "_location": "/avataaars",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "range",
+    "registry": true,
+    "raw": "avataaars@^1.2.1",
+    "name": "avataaars",
+    "escapedName": "avataaars",
+    "rawSpec": "^1.2.1",
+    "saveSpec": null,
+    "fetchSpec": "^1.2.1"
+  },
+  "_requiredBy": [
+    "/react-native-avataaars"
+  ],
+  "_resolved": "https://registry.npmjs.org/avataaars/-/avataaars-1.2.1.tgz",
+  "_shasum": "8e2e968dbd7f558876f1f18f56973e7aa47afbec",
+  "_spec": "avataaars@^1.2.1",
+  "_where": "D:\\Downloads\\original\\node_modules\\react-native-avataaars",
+  "author": {
+    "name": "Fang-Pen Lin",
+    "email": "hello@fangpenlin.com"
+  },
+  "bugs": {
+    "url": "https://github.com/fangpenlin/avataaars/issues"
+  },
+  "bundleDependencies": false,
+  "dependencies": {
+    "lodash": "^4.17.4",
+    "prop-types": "^15.6.0"
+  },
+  "deprecated": false,
+  "description": "React component for avataaars ",
+  "devDependencies": {
+    "@types/react": "^16.0.25",
+    "import-sort-style-renke": "^4.2.0",
+    "tslint": "^5.8.0",
+    "tslint-config-standard": "^7.0.0",
+    "tslint-react": "^3.2.0",
+    "typescript": "^2.6.2"
+  },
+  "homepage": "https://github.com/fangpenlin/avataaars#readme",
+  "importSort": {
+    ".js, .jsx, .es6, .es": {
+      "parser": "babylon",
+      "style": "import-sort-style-renke"
+    },
+    ".ts, .tsx": {
+      "parser": "typescript",
+      "style": "import-sort-style-renke"
+    }
+  },
+  "keywords": [
+    "react",
+    "avatar"
+  ],
+  "license": "MIT",
+  "main": "dist/index.js",
+  "name": "avataaars",
+  "peerDependencies": {
+    "react": "^16.0.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/fangpenlin/avataaars.git"
+  },
+  "types": "dist/index.d.ts",
+  "version": "1.2.1"
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/Skin.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/Skin.tsx
new file mode 100644
index 000000000..08705d3b8
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/Skin.tsx
@@ -0,0 +1,52 @@
+import * as React from 'react'
+
+import { Selector, SkinOption } from '../options'
+
+export interface Props {
+  maskID: string
+}
+
+function makeColor(name: string, color: string) {
+  class ColorComponent extends React.Component<Props> {
+    render() {
+      return (
+        <g
+          id="Skin/👶🏽-03-Brown"
+          mask={`url(#${this.props.maskID})`}
+          fill={color}>
+          <g transform="translate(0.000000, 0.000000)" id="Color">
+            <rect x="0" y="0" width="264" height="280" />
+          </g>
+        </g>
+      )
+    }
+  }
+  const anyComponent = ColorComponent as any
+  anyComponent.displayName = name
+  anyComponent.optionValue = name
+  return anyComponent
+}
+
+const Tanned = makeColor('Tanned', '#FD9841')
+const Yellow = makeColor('Yellow', '#F8D25C')
+const Pale = makeColor('Pale', '#FFDBB4')
+const Light = makeColor('Light', '#EDB98A')
+const Brown = makeColor('Brown', '#D08B5B')
+const DarkBrown = makeColor('DarkBrown', '#AE5D29')
+const Black = makeColor('Black', '#614335')
+
+export default class Skin extends React.Component<Props> {
+  render() {
+    return (
+      <Selector option={SkinOption} defaultOption={Light}>
+        <Tanned maskID={this.props.maskID} />
+        <Yellow maskID={this.props.maskID} />
+        <Pale maskID={this.props.maskID} />
+        <Light maskID={this.props.maskID} />
+        <Brown maskID={this.props.maskID} />
+        <DarkBrown maskID={this.props.maskID} />
+        <Black maskID={this.props.maskID} />
+      </Selector>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/BlazerShirt.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/BlazerShirt.tsx
new file mode 100644
index 000000000..067cc851c
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/BlazerShirt.tsx
@@ -0,0 +1,74 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+export default class BlazerShirt extends React.Component {
+  static optionValue = 'BlazerShirt'
+
+  private path1 = uniqueId('react-path-')
+  private mask1 = uniqueId('react-mask-')
+
+  render () {
+    const { path1, mask1 } = this
+    return (
+      <g
+        id='Clothing/Blazer-+-Shirt'
+        transform='translate(0.000000, 170.000000)'>
+        <defs>
+          <path
+            d='M133.960472,0.294916112 C170.936473,3.32499816 200,34.2942856 200,72.0517235 L200,81 L0,81 L0,72.0517235 C1.22536245e-14,33.9525631 29.591985,2.76498122 67.0454063,0.219526408 C67.0152598,0.593114549 67,0.969227185 67,1.34762511 C67,13.2107177 81.9984609,22.8276544 100.5,22.8276544 C119.001539,22.8276544 134,13.2107177 134,1.34762511 C134,0.994669088 133.986723,0.64370138 133.960472,0.294916112 Z'
+            id={path1}
+          />
+        </defs>
+        <g id='Shirt' transform='translate(32.000000, 29.000000)'>
+          <mask id={mask1} fill='white'>
+            <use xlinkHref={'#' + path1} />
+          </mask>
+          <use id='Clothes' fill='#E6E6E6' xlinkHref={'#' + path1} />
+          <g id='Color/Palette/Black' mask={`url(#${mask1})`} fill='#262E33'>
+            <g transform='translate(-32.000000, -29.000000)' id='🖍Color'>
+              <rect x='0' y='0' width='264' height='110' />
+            </g>
+          </g>
+          <g
+            id='Shadowy'
+            opacity='0.599999964'
+            mask={`url(#${mask1})`}
+            fillOpacity='0.16'
+            fill='#000000'>
+            <g transform='translate(60.000000, -25.000000)' id='Hola-👋🏼'>
+              <ellipse
+                cx='40.5'
+                cy='27.8476251'
+                rx='39.6351047'
+                ry='26.9138272'
+              />
+            </g>
+          </g>
+        </g>
+        <g id='Blazer' transform='translate(32.000000, 28.000000)'>
+          <path
+            d='M68.784807,1.12222847 C30.512317,2.80409739 -1.89486556e-14,34.3646437 -1.42108547e-14,73.0517235 L0,73.0517235 L0,82 L69.3616767,82 C65.9607412,69.9199941 64,55.7087296 64,40.5 C64,26.1729736 65.7399891,12.7311115 68.784807,1.12222847 Z M131.638323,82 L200,82 L200,73.0517235 C200,34.7067641 170.024954,3.36285166 132.228719,1.17384225 C135.265163,12.7709464 137,26.1942016 137,40.5 C137,55.7087296 135.039259,69.9199941 131.638323,82 Z'
+            id='Saco'
+            fill='#3A4C5A'
+          />
+          <path
+            d='M149,58 L158.555853,50.83311 L158.555853,50.83311 C159.998897,49.7508275 161.987779,49.7682725 163.411616,50.8757011 L170,56 L149,58 Z'
+            id='Pocket-hanky'
+            fill='#E6E6E6'
+          />
+          <path
+            d='M69,1.13686838e-13 C65,19.3333333 66.6666667,46.6666667 74,82 L58,82 L44,46 L50,37 L44,31 L63,1 C65.027659,0.369238637 67.027659,0.0359053037 69,1.13686838e-13 Z'
+            id='Wing'
+            fill='#2F4351'
+          />
+          <path
+            d='M151,1.13686838e-13 C147,19.3333333 148.666667,46.6666667 156,82 L140,82 L126,46 L132,37 L126,31 L145,1 C147.027659,0.369238637 149.027659,0.0359053037 151,1.13686838e-13 Z'
+            id='Wing'
+            fill='#2F4351'
+            transform='translate(141.000000, 41.000000) scale(-1, 1) translate(-141.000000, -41.000000) '
+          />
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/BlazerSweater.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/BlazerSweater.tsx
new file mode 100644
index 000000000..c39f3085c
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/BlazerSweater.tsx
@@ -0,0 +1,74 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+export default class BlazerSweater extends React.Component {
+  static optionValue = 'BlazerSweater'
+
+  private path1 = uniqueId('react-path-')
+  private mask1 = uniqueId('react-mask-')
+
+  render () {
+    const { path1, mask1 } = this
+    return (
+      <g
+        id='Clothing/Blazer-+-Sweater'
+        transform='translate(0.000000, 170.000000)'>
+        <defs>
+          <path
+            d='M105.192402,29.0517235 L104,29.0517235 L104,29.0517235 C64.235498,29.0517235 32,61.2872215 32,101.051724 L32,110 L232,110 L232,101.051724 C232,61.2872215 199.764502,29.0517235 160,29.0517235 L160,29.0517235 L158.807598,29.0517235 C158.934638,30.0353144 159,31.0364513 159,32.0517235 C159,45.8588423 146.911688,57.0517235 132,57.0517235 C117.088312,57.0517235 105,45.8588423 105,32.0517235 C105,31.0364513 105.065362,30.0353144 105.192402,29.0517235 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <use
+          id='Clothes'
+          fill='#E6E6E6'
+          fillRule='evenodd'
+          xlinkHref={'#' + path1}
+        />
+        <g
+          id='Color/Palette/Black'
+          mask={`url(#${mask1})`}
+          fillRule='evenodd'
+          fill='#262E33'>
+          <rect id='🖍Color' x='0' y='0' width='264' height='110' />
+        </g>
+        <g
+          id='Blazer'
+          strokeWidth='1'
+          fillRule='evenodd'
+          transform='translate(32.000000, 28.000000)'>
+          <path
+            d='M68.784807,1.12222847 C30.512317,2.80409739 1.24427139e-14,34.3646437 0,73.0517235 L0,82 L69.3616767,82 C65.9607412,69.9199941 64,55.7087296 64,40.5 C64,26.1729736 65.7399891,12.7311115 68.784807,1.12222847 Z M131.638323,82 L200,82 L200,73.0517235 C200,34.7067641 170.024954,3.36285166 132.228719,1.17384225 C135.265163,12.7709464 137,26.1942016 137,40.5 C137,55.7087296 135.039259,69.9199941 131.638323,82 Z'
+            id='Saco'
+            fill='#3A4C5A'
+          />
+          <path
+            d='M149,58 L158.555853,50.83311 L158.555853,50.83311 C159.998897,49.7508275 161.987779,49.7682725 163.411616,50.8757011 L170,56 L149,58 Z'
+            id='Pocket-hanky'
+            fill='#E6E6E6'
+          />
+          <path
+            d='M69,1.13686838e-13 C65,19.3333333 66.6666667,46.6666667 74,82 L58,82 L44,46 L50,37 L44,31 L63,1 C65.027659,0.369238637 67.027659,0.0359053037 69,1.13686838e-13 Z'
+            id='Wing'
+            fill='#2F4351'
+          />
+          <path
+            d='M151,1.13686838e-13 C147,19.3333333 148.666667,46.6666667 156,82 L140,82 L126,46 L132,37 L126,31 L145,1 C147.027659,0.369238637 149.027659,0.0359053037 151,1.13686838e-13 Z'
+            id='Wing'
+            fill='#2F4351'
+            transform='translate(141.000000, 41.000000) scale(-1, 1) translate(-141.000000, -41.000000) '
+          />
+        </g>
+        <path
+          d='M156,21.5390062 C162.772319,26.1359565 167,32.6563196 167,39.8878801 C167,47.2887711 162.572015,53.9447688 155.520105,58.5564942 L149.57933,53.8764929 L145,54.207887 L146,51.0567821 L145.922229,50.995516 C152.022491,47.8530505 156,42.7003578 156,36.8768102 L156,21.5390062 Z M108,21.5390062 C101.227681,26.1359565 97,32.6563196 97,39.8878801 C97,47.2887711 101.427985,53.9447688 108.479895,58.5564942 L114.42067,53.8764929 L119,54.207887 L118,51.0567821 L118.077771,50.995516 C111.977509,47.8530505 108,42.7003578 108,36.8768102 L108,21.5390062 Z'
+          id='Collar'
+          fill='#F2F2F2'
+          fillRule='evenodd'
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/CollarSweater.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/CollarSweater.tsx
new file mode 100644
index 000000000..68540c05b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/CollarSweater.tsx
@@ -0,0 +1,43 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import Colors from './Colors'
+
+export default class CollarSweater extends React.Component {
+  static optionValue = 'CollarSweater'
+
+  private path1 = uniqueId('react-path-')
+  private mask1 = uniqueId('react-mask-')
+
+  render () {
+    const { path1, mask1 } = this
+    return (
+      <g
+        id='Clothing/Collar-+-Sweater'
+        transform='translate(0.000000, 170.000000)'>
+        <defs>
+          <path
+            d='M105.192402,29.0517235 L104,29.0517235 L104,29.0517235 C64.235498,29.0517235 32,61.2872215 32,101.051724 L32,110 L232,110 L232,101.051724 C232,61.2872215 199.764502,29.0517235 160,29.0517235 L160,29.0517235 L158.807598,29.0517235 C158.934638,30.0353144 159,31.0364513 159,32.0517235 C159,45.8588423 146.911688,57.0517235 132,57.0517235 C117.088312,57.0517235 105,45.8588423 105,32.0517235 C105,31.0364513 105.065362,30.0353144 105.192402,29.0517235 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <use
+          id='Clothes'
+          fill='#E6E6E6'
+          fillRule='evenodd'
+          xlinkHref={'#' + path1}
+        />
+        <Colors maskID={mask1} />
+        <path
+          d='M156,22.2794906 C162.181647,26.8351858 166,33.1057265 166,40.027915 C166,47.2334941 161.862605,53.7329769 155.228997,58.3271669 L149.57933,53.8764929 L145,54.207887 L146,51.0567821 L145.922229,50.995516 C152.022491,47.8530505 156,42.7003578 156,36.8768102 L156,22.2794906 Z M108,21.5714994 C101.232748,26.1740081 97,32.7397769 97,40.027915 C97,47.4261549 101.361602,54.080035 108.308428,58.6915723 L114.42067,53.8764929 L119,54.207887 L118,51.0567821 L118.077771,50.995516 C111.977509,47.8530505 108,42.7003578 108,36.8768102 L108,21.5714994 Z'
+          id='Collar'
+          fill='#F2F2F2'
+          fillRule='evenodd'
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/Colors.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/Colors.tsx
new file mode 100644
index 000000000..4554703ee
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/Colors.tsx
@@ -0,0 +1,67 @@
+import * as React from 'react'
+
+import { ClotheColorOption, Selector } from '../../options'
+
+export interface Props {
+  maskID: string
+}
+
+function makeColor (name: string, color: string) {
+  class ColorComponent extends React.Component<Props> {
+    render () {
+      return (
+        <g
+          id='Color/Palette/Gray-01'
+          mask={`url(#${this.props.maskID})`}
+          fillRule='evenodd'
+          fill={color}>
+          <rect id='🖍Color' x='0' y='0' width='264' height='110' />
+        </g>
+      )
+    }
+  }
+  const anyComponent = ColorComponent as any
+  anyComponent.displayName = name
+  anyComponent.optionValue = name
+  return anyComponent
+}
+
+const Black = makeColor('Black', '#262E33')
+const Blue01 = makeColor('Blue01', '#65C9FF')
+const Blue02 = makeColor('Blue02', '#5199E4')
+const Blue03 = makeColor('Blue03', '#25557C')
+const Gray01 = makeColor('Gray01', '#E6E6E6')
+const Gray02 = makeColor('Gray02', '#929598')
+const Heather = makeColor('Heather', '#3C4F5C')
+const PastelBlue = makeColor('PastelBlue', '#B1E2FF')
+const PastelGreen = makeColor('PastelGreen', '#A7FFC4')
+const PastelOrange = makeColor('PastelOrange', '#FFDEB5')
+const PastelRed = makeColor('PastelRed', '#FFAFB9')
+const PastelYellow = makeColor('PastelYellow', '#FFFFB1')
+const Pink = makeColor('Pink', '#FF488E')
+const Red = makeColor('Red', '#FF5C5C')
+const White = makeColor('White', '#FFFFFF')
+
+export default class Colors extends React.Component<Props> {
+  render () {
+    return (
+      <Selector option={ClotheColorOption} defaultOption={Gray01}>
+        <Black maskID={this.props.maskID} />
+        <Blue01 maskID={this.props.maskID} />
+        <Blue02 maskID={this.props.maskID} />
+        <Blue03 maskID={this.props.maskID} />
+        <Gray01 maskID={this.props.maskID} />
+        <Gray02 maskID={this.props.maskID} />
+        <Heather maskID={this.props.maskID} />
+        <PastelBlue maskID={this.props.maskID} />
+        <PastelGreen maskID={this.props.maskID} />
+        <PastelOrange maskID={this.props.maskID} />
+        <PastelRed maskID={this.props.maskID} />
+        <PastelYellow maskID={this.props.maskID} />
+        <Pink maskID={this.props.maskID} />
+        <Red maskID={this.props.maskID} />
+        <White maskID={this.props.maskID} />
+      </Selector>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/GraphicShirt.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/GraphicShirt.tsx
new file mode 100644
index 000000000..b728426b9
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/GraphicShirt.tsx
@@ -0,0 +1,39 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import Colors from './Colors'
+import Graphics from './Graphics'
+
+export default class GraphicShirt extends React.Component {
+  static optionValue = 'GraphicShirt'
+
+  private path1 = uniqueId('react-path-')
+  private mask1 = uniqueId('react-mask-')
+
+  render () {
+    const { path1, mask1 } = this
+    return (
+      <g
+        id='Clothing/Graphic-Shirt'
+        transform='translate(0.000000, 170.000000)'>
+        <defs>
+          <path
+            d='M165.624032,29.2681342 C202.760022,32.1373245 232,63.1798426 232,101.051724 L232,110 L32,110 L32,101.051724 C32,62.8348009 61.7752018,31.5722494 99.3929298,29.1967444 C99.1342224,30.2735458 99,31.3767131 99,32.5 C99,44.3741221 113.998461,54 132.5,54 C151.001539,54 166,44.3741221 166,32.5 C166,31.4015235 165.871641,30.3222877 165.624025,29.2681336 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <use
+          id='Clothes'
+          fill='#E6E6E6'
+          fillRule='evenodd'
+          xlinkHref={'#' + path1}
+        />
+        <Colors maskID={mask1} />
+        <Graphics maskID={mask1} />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/Graphics.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/Graphics.tsx
new file mode 100644
index 000000000..0eab359c2
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/Graphics.tsx
@@ -0,0 +1,397 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import { GraphicOption, Selector } from '../../options'
+
+export interface Props {
+  maskID: string
+}
+
+export class Skull extends React.Component<Props> {
+  static optionValue = 'Skull'
+  render () {
+    return (
+      <g
+        id='Clothing/Graphic/Skull'
+        mask={`url(#${this.props.maskID})`}
+        fillRule='evenodd'
+        fill='#FFFFFF'>
+        <g transform='translate(77.000000, 58.000000)' id='Fill-49'>
+          <path d='M65.2820354,19.9288113 C64.9841617,22.7059411 59.588846,24.2025715 57.6102394,22.3766824 C56.6984983,21.5350479 56.6825881,19.8029182 56.4815012,18.6751632 C56.1014249,16.5420247 55.8256486,14.4172496 55.7306295,12.2519776 C55.6727342,10.9274596 55.3253621,9.86749314 56.7745135,9.67029008 C57.65797,9.55055964 58.5675014,10.137767 59.2896464,10.6026028 C61.736719,12.1758255 65.6201265,16.7414286 65.2820354,19.9288113 M52.8813831,14.0756657 C53.1659984,16.901216 54.2014853,21.8145656 51.9457767,24.1810024 C49.9296045,26.2960933 45.7863308,24.19905 45.1631825,21.7084809 C44.3897714,18.6188195 47.4383369,14.9274245 49.307782,12.8387447 C49.881874,12.1969544 51.151594,10.4256483 52.1442119,11.018578 C52.526056,11.2461539 52.8367463,13.6301981 52.8813831,14.0756657 M54.3212536,25.1062722 C54.9678252,23.5832306 61.2342228,28.1246236 58.2744891,30.2850536 C57.7918806,30.6376421 54.1148633,31.7513112 53.4099544,31.2274906 C51.9250051,30.1235056 53.8408548,26.2630794 54.3212536,25.1062722 M73.3250687,17.5267194 C72.8817937,2.05112066 53.065234,-2.31331777 42.4756895,6.50447654 C38.426551,9.87585667 36.113389,14.0039155 36.0073212,19.2826191 C35.9171635,23.7544627 36.6256081,27.9718792 40.0409914,31.0465744 C41.5219631,32.379896 42.5004386,33.1955596 43.2862243,35.0170469 C44.1095756,36.9234899 44.4852324,39.3524331 46.0280771,40.8495037 C46.8788292,41.6752915 48.1176128,42.3417322 49.2940816,41.8091079 C51.455655,40.8301355 50.7644465,37.8320326 51.4194152,36.1606486 C53.4559171,41.1294616 58.6302582,42.7141291 59.5694002,36.4097935 C60.6000257,38.2286397 63.2945899,40.610483 65.268335,38.6195243 C66.0806376,37.8003393 66.2030575,36.4705391 66.3409457,35.3929652 C66.5857855,33.4807998 66.1601884,32.7294032 67.6955199,31.4180909 C71.7349355,27.9683578 73.4691441,22.7464381 73.3250687,17.5267194' />
+        </g>
+      </g>
+    )
+  }
+}
+
+export class SkullOutline extends React.Component<Props> {
+  static optionValue = 'SkullOutline'
+  render () {
+    return (
+      <g
+        id='Clothing/Graphic/Skull-Outline'
+        mask={`url(#${this.props.maskID})`}
+        strokeWidth='1'
+        fillRule='evenodd'>
+        <g transform='translate(77.000000, 58.000000)' id='Skull'>
+          <g transform='translate(36.000000, 1.000000)'>
+            <path
+              d='M36.3353853,17.0393673 C36.1551375,18.0777567 35.8927571,19.1087846 35.3466862,20.0285256 C34.6274709,21.2401241 33.3213404,21.7355025 32.5643885,22.8466397 C31.3705799,24.5990841 32.9555173,27.1231756 31.7781352,28.6842237 C30.5119611,30.3630542 27.6359878,29.346749 26.5163205,31.5755188 C25.3358307,33.925968 27.0535122,37.0679834 25.5729054,39.4058749 C24.1038415,39.0369393 23.6514462,33.5197923 21.3841422,37.0389708 C19.9319488,39.2928559 20.9126566,40.513981 18.7354764,37.2741024 C17.9789685,36.1486754 17.1247893,35.1384326 15.6392989,35.8810671 C14.5955488,36.4024269 14.3806721,38.7178013 13.4297097,38.9672226 C11.0962556,39.5786511 11.0105713,33.3500473 10.2172146,32.1709255 C9.78124586,31.523123 9.3750224,31.1394645 8.59986813,30.8939404 C7.92815655,30.6808931 6.73124021,31.1087199 6.17495825,30.7934791 C5.13032022,30.2019696 4.98914092,28.23821 4.94962847,27.1963565 C4.8759311,25.2572791 5.52544468,23.2770647 4.98958488,21.3579064 C4.53896541,19.7461945 3.1027546,18.7545717 2.63348882,17.1753366 C0.0993647654,8.64045187 11.6836147,3.89495204 18.2986197,3.63037495 C26.0390634,3.32033043 37.3356273,7.85191686 36.3353853,17.0393673 M38.172936,11.7240091 C36.716747,8.28277481 33.5180147,5.54736808 30.2580159,3.71135026 C28.6748543,2.82018878 26.955841,2.16285976 25.1728973,1.77140691 C23.531577,1.41069869 21.6150014,1.64842836 20.0482663,1.19462018 C18.728373,0.811827785 17.9097107,-0.0477230086 16.3562944,0.00207464445 C14.238161,0.0696262433 12.0370069,1.17426809 10.1879133,2.08751375 C6.5279065,3.89538507 3.41663437,6.23630778 1.4618782,9.83126531 C-0.636277062,13.6895009 -0.437382953,17.1865952 1.81083082,20.7832848 C3.95648981,24.2167247 0.837226393,29.045365 3.97824385,32.3086268 C5.29902504,33.6808769 6.59938407,32.6801606 7.84957562,33.3409538 C8.81163708,33.8493229 8.77123671,36.8034063 9.03805671,37.6694524 C10.2385247,41.5623298 14.5524847,43.0692501 16.5436456,38.8602659 C17.4830651,41.2128802 21.1990108,43.6239527 22.9291232,40.5460247 C24.0106099,41.9455552 25.8832335,42.541395 27.3123409,41.3414881 C28.6557641,40.2130299 28.8040467,37.585879 28.8724166,35.9984164 C28.9261357,34.7604034 28.3747373,33.2339971 29.3261438,32.3402375 C30.3734455,31.3559761 32.5204364,31.7708122 33.6951548,30.5011885 C35.0359141,29.0518603 34.4849597,27.3552759 34.5879584,25.6288129 C34.6922891,23.8828639 35.0035051,24.3280116 36.2980926,23.0670485 C39.1833891,20.2567287 39.6717451,15.2600755 38.172936,11.7240091'
+              id='Boo!'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M14.4199416,28.1214878 C16.4409104,26.2992475 16.0109503,20.7236412 15.8441352,18.1620823 C15.5281264,13.3012213 12.4886458,14.7535905 10.6384079,17.7811955 C9.23849255,20.072024 5.8716471,23.7758196 7.38120621,26.6576793 C8.58337131,28.9535919 12.5610889,29.793746 14.4199416,28.1214878'
+              id='Boo!'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M27.7905585,19.2735023 C26.7563456,17.3532744 26.3690889,17.0619469 25.1393718,15.4887787 C24.3486011,14.4775769 23.2406052,12.6869687 21.7361817,13.0471169 C19.1541926,13.6660822 20.2075808,19.6585611 20.238428,21.4487472 C20.2617717,22.8065864 19.9608037,24.2138247 21.0892255,25.1768941 C22.2443259,26.1627631 24.1422588,26.073676 25.5295464,25.8676357 C29.7877025,25.2338929 29.5913646,22.6136348 27.7905585,19.2735023'
+              id='Boo!'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M19.2396436,31.8300192 C18.9563137,31.7944779 19.3174042,31.4678578 19.3591799,31.2433628 C19.5473771,31.8574625 19.6855263,31.8862554 19.2396436,31.8300192 M20.2848621,27.5191742 C17.6678865,24.7492021 12.711061,33.9166085 16.2049116,34.9450569 C17.0098167,35.1821488 17.604189,34.5815458 18.3598733,34.4767215 C19.4596896,34.3242088 20.3837174,34.9635023 21.3333895,33.9548492 C22.8244907,32.3712368 21.5203459,28.8566969 20.2848621,27.5191742'
+              id='Boo!'
+              fill='#FFFFFF'
+            />
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
+
+export class Bat extends React.Component<Props> {
+  static optionValue = 'Bat'
+  render () {
+    return (
+      <g
+        id='Clothing/Graphic/Bat'
+        mask={`url(#${this.props.maskID})`}
+        fillRule='evenodd'
+        fill='#FFFFFF'>
+        <g transform='translate(77.000000, 58.000000)' id='Batman!'>
+          <path d='M87.6852404,13.4031978 C86.29151,6.97182978 81.4755637,3.2534243 75.1844381,1.81688169 C72.6586144,1.2402574 64.2721154,-0.570361088 65.5784818,4.22465302 C66.1709196,6.39748644 65.8414841,8.18940114 64.0250388,9.99135202 C62.2550056,11.7463153 58.793658,12.1906445 57.0732221,9.97994727 C55.5989529,8.08493361 57.5000322,5.25883596 56.3515582,3.41309083 C55.9056373,2.69596 55.1361961,2.32963935 54.323983,2.68090573 C53.1827893,3.17450341 53.7902429,4.23560158 53.2510425,4.99880761 C52.4024277,6.20178089 52.005649,5.82542406 51.2416681,4.6261003 C50.7616206,3.87247426 51.2334777,3.05133209 49.9949096,2.72926188 C48.5615922,2.35655457 48.0924652,3.5572469 47.9627841,4.65164695 C47.8813352,5.33866923 48.2849392,6.44356164 48.2990449,7.14016392 C48.3263462,8.50417231 48.2084956,10.4630526 47.5741958,11.668763 C46.449383,13.8060136 44.8695487,13.1221847 43.1909749,11.7645629 C41.2107218,10.1633357 40.6296595,8.3800886 41.0127875,5.94768301 C41.4719041,3.03125972 41.3053663,0.239376333 37.7334484,2.06368053 C32.7127425,4.62792506 28.0537786,9.19894983 25.144827,13.9830154 C22.6999971,18.0025063 20.7757117,22.8759851 22.9416134,27.4556775 C25.1521073,32.1307136 28.8036539,36.1460988 33.9080837,37.3394921 C35.2294658,37.6483328 38.9997729,39.1501106 40.2533568,37.8905698 C42.1999383,35.9335142 37.7052371,34.1082977 36.8179454,32.9158167 C35.5598113,31.2256324 34.4805006,28.0012808 35.8614905,26.0944062 C37.6206031,23.6670187 39.4602546,25.0200786 40.9063125,26.7376343 C42.0415909,28.085676 43.6550967,31.5636693 45.4119342,28.759925 C46.621381,26.8288723 46.513086,23.6583511 49.812446,25.0433443 C54.5269225,27.0213845 54.6716193,36.1552226 55.5120438,40.3343801 C55.879246,42.1637024 57.5473544,44.3981215 58.9829469,41.8594236 C59.7719539,40.4634819 59.3460539,37.437573 59.2022672,35.9960123 C58.9055932,33.0111605 58.1225014,30.0760334 59.092607,27.1190092 C59.6536484,25.4082963 61.093336,22.9594679 63.2223811,24.2751201 C64.9469121,25.3407802 64.2284333,30.0910877 66.5745236,30.0824201 C68.6412307,30.075121 68.0774592,26.2910242 69.1777009,25.0433443 C70.8571848,23.1387506 74.0937518,24.0442879 75.0870635,26.2919365 C76.4243714,29.3169331 72.88476,31.4176885 73.0435625,34.0768205 C73.1982698,36.6684365 76.5376717,35.657063 77.9345873,34.9996931 C80.8057722,33.6493704 83.0526678,31.1467116 84.6097509,28.428731 C87.0172691,24.2253954 88.7354298,18.2068795 87.6852404,13.4031978' />
+        </g>
+      </g>
+    )
+  }
+}
+
+export class Cumbia extends React.Component<Props> {
+  static optionValue = 'Cumbia'
+  render () {
+    return (
+      <g
+        id='Clothing/Graphic/Cumbia'
+        mask={`url(#${this.props.maskID})`}
+        strokeWidth='1'
+        fillRule='evenodd'>
+        <g transform='translate(77.000000, 58.000000)' id='Group'>
+          <g transform='translate(0.000000, 6.000000)'>
+            <path
+              d='M10.271566,24.1315073 C13.5453197,23.5731503 16.0029461,20.5783262 15.4519585,17.3443595 C14.9878717,14.6197774 13.7065483,17.0011951 12.4758861,18.1969085 C11.1405733,19.4948562 10.0263951,20.7706412 7.9400381,20.2508902 C4.33273358,19.3518711 3.08247252,14.8503409 4.09976568,11.7711556 C4.65593031,10.0878629 5.87660814,8.76060323 7.57838317,8.07498941 C9.42992328,7.32896437 10.7818767,8.16542752 12.3264908,9.1691833 C12.6145575,9.35649386 14.0556303,10.5386236 14.3204002,10.4181586 C14.7822683,10.2079704 14.435405,7.98955578 14.3651448,7.69393398 C14.0267867,6.27266155 13.0993526,5.11877135 11.7481388,4.45603516 C8.41484886,2.82099993 4.23436935,4.94468693 2.10881463,7.51091298 C-2.77648522,13.4083357 1.18803674,25.6753895 10.271566,24.1315073'
+              id='Fill-1'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M20.283037,5.0382162 C20.2819296,5.04100097 20.2826679,5.03926048 20.283037,5.0382162 M18.6886879,17.9031695 C19.1918363,21.3771733 21.6658646,24.4038731 25.6412168,24.2597611 C29.9192703,24.1048581 31.6970859,20.1616201 32.6494871,16.7739442 C33.6055798,13.3751292 34.7008413,9.09110464 33.3132148,5.68149867 C32.8931247,4.64939232 32.6284457,3.30051808 31.5966777,4.15126612 C30.3445285,5.18372056 30.188379,8.18953451 30.0824336,9.59271181 C29.8819863,12.2396382 29.3005786,19.5639383 25.9741881,20.5368682 C21.7954354,21.7593834 21.9264829,14.6895419 21.9733647,12.559887 C22.0147092,10.6641531 22.2203245,8.82550695 21.6322721,6.97572174 C21.3192348,5.99095653 21.0416357,4.53521664 20.1036312,5.34175641 C18.8141981,6.45044401 18.6506656,9.16977447 18.5602244,10.6690264 C18.4155185,13.0736776 18.3464879,15.5110498 18.6886879,17.9031695'
+              id='Fill-5'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M37.7827156,20.7457507 C37.9712859,21.1583285 38.4071734,22.1476129 38.8028084,22.4248624 C39.7471104,23.085889 38.7480505,23.1327334 39.6027816,22.3662202 C40.4161723,21.6371824 40.7331154,19.6485506 40.8571366,18.6953537 C41.2422552,15.7354812 40.7367418,12.5875371 40.7704668,9.60302793 C41.7938233,11.8206768 42.3544573,14.1868398 43.1555184,16.4766638 C43.7096249,18.0589637 44.5516638,21.2808179 46.809793,21.2301566 C49.2532288,21.1753312 49.3790632,18.0849884 49.7043469,16.4110816 C50.1652562,14.0411017 50.674396,11.6898595 51.3797214,9.37401083 C51.4718308,13.2836103 49.952752,20.3692605 53.4880823,23.2940864 C53.5018625,23.3072722 54.9204913,19.144366 54.954579,18.8882832 C55.1783249,17.1970267 55.0383477,15.4440049 55.0622816,13.7402565 C55.1130505,10.1433001 55.779574,5.73680294 54.762745,2.23422934 C54.4338349,1.10024771 53.7872564,-0.0302639607 52.3530342,0.000618647874 C50.5278914,0.0401761465 50.1202895,1.98612748 49.6550286,3.29915884 C48.3742011,6.91277103 47.2097796,10.5229133 46.2981148,14.2395832 C45.7498104,12.5594305 40.9593998,-2.18198369 37.5092887,3.33767535 C36.9540943,4.22633108 37.1937961,5.55601823 37.1709501,6.53385184 C37.1274339,8.41283302 37.0161049,10.2897322 36.9754898,12.1690604 C36.9138418,15.0116484 36.5653494,18.0756195 37.7827156,20.7457507'
+              id='Fill-7'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M62.0203329,7.70997634 C62.739914,7.57453437 67.7552707,5.98272311 67.5433251,7.57379827 C67.3203514,9.24915661 62.9098151,10.8829254 61.7267107,11.4497207 C61.7246429,10.2414163 61.4930536,9.00918877 61.0839813,7.88259125 C61.3958688,7.82517563 61.7081008,7.76739196 62.0203329,7.70997634 M67.7366608,7.0706755 C67.7370055,7.06957135 67.7101246,7.03497476 67.7366608,7.0706755 M67.8590034,15.4110304 C70.1314738,16.6318484 69.1461853,18.8279958 67.4326998,20.0186339 C66.7844565,20.4691256 60.9030521,21.8209691 60.9195942,21.6818466 C60.9202835,21.6855271 60.9192496,21.6869993 60.9164926,21.6866312 C61.0960433,19.9925024 60.6587116,16.6686533 61.9159109,15.6664563 C63.2203241,14.6267183 66.4163948,14.8593252 67.8590034,15.4110304 M67.9210363,7.41553727 C67.9299966,7.4383563 67.9220702,7.41811361 67.9210363,7.41553727 M57.9444294,24.2596607 C58.1677477,24.8109979 58.8039291,26.1720425 59.5100698,26.2047988 C60.3706034,26.2449162 60.3040904,25.1617484 60.4388396,24.49558 C63.8802848,26.2162084 68.9369967,24.4481017 71.346284,21.4654339 C74.1325933,18.014976 72.6941202,13.1953763 68.7674402,11.7202366 C70.879659,10.0319965 72.7933728,6.32096 70.0222271,4.23081061 C67.8262639,2.57459081 64.19424,2.48294665 61.8993688,3.92827446 C59.1637197,5.65111111 58.0495406,9.7614806 57.8096802,12.9340616 C57.553967,16.3156944 56.6513889,21.0591079 57.9444294,24.2596607'
+              id='Fill-9'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M76.0506048,15.8714133 C76.1237655,17.940757 75.9002189,20.1580872 76.3823293,22.1766928 C76.5533503,22.8940747 76.8153532,23.6882686 77.1423879,24.3390566 C77.7529985,25.5536025 77.4525393,25.3897603 78.1744543,24.6980999 C80.3464523,22.6164239 79.3828568,16.1236949 79.3306438,13.4500732 C79.2896863,11.3715683 79.3947376,9.17044617 78.8182061,7.16734396 C78.656252,6.60499548 77.6954704,3.81897451 77.1633356,3.88345432 C76.3469995,3.98140725 75.7873513,7.81319908 75.7401407,8.57603396 C75.592256,10.9723573 75.9658759,13.4712141 76.0506048,15.8714133'
+              id='Fill-11'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M94.7477626,16.430477 C93.1655372,16.2926323 91.1264105,16.5045376 89.6311966,16.9871715 C90.3280165,15.0708102 91.1056588,12.9329761 91.8694667,11.1973368 C92.343479,10.1066267 92.8411555,9.02761048 93.3628603,7.95745314 C94.6410916,10.6431228 95.3546586,13.7848497 96.19492,16.6232471 C95.7158108,16.535721 95.233425,16.4715824 94.7477626,16.430477 M100.188346,17.1547822 C99.4605809,14.375208 98.6093975,11.6225649 97.7622188,8.8759458 C97.2244951,7.13215631 96.6321618,4.96384744 95.1624324,3.70729846 C90.9986238,0.146013273 88.6354794,9.55701945 87.6142778,11.9390054 C86.6294827,14.2352371 85.3978516,16.5725741 84.764743,18.9878696 C84.4541957,20.1714211 84.3555342,21.4261983 84.5197274,22.6402245 C84.725424,24.1589974 84.5157227,24.3811791 85.8136135,23.5544648 C86.8140635,22.9176858 87.2280051,21.7617741 88.0409617,20.9917569 C88.1847673,20.8556839 88.2586724,20.3241488 88.4301469,20.2373314 C88.6194606,20.1413008 89.9348266,20.4896334 90.2461019,20.5112492 C92.4155638,20.6622052 94.958192,20.2933198 96.9605482,19.4573923 C97.1658807,20.2989895 98.5882817,25.4187356 99.9378698,25.2302178 C100.5353,25.1465897 100.903369,22.1660952 100.929946,21.6933833 C101.017322,20.1398833 100.57826,18.6444979 100.188346,17.1547822'
+              id='Fill-13'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M109.301672,3.43213272 C109.038492,2.22890734 108.487555,0.14016215 107.459721,1.31990649 C106.069159,2.9162614 106.369359,6.49285063 106.348516,8.49692176 C106.333584,9.94847693 104.797121,20.5594163 106.905363,20.3801066 C106.815459,20.3801066 107.750277,18.7118855 107.885912,18.4578633 C108.700028,16.9340861 109.016405,15.4885791 109.213945,13.735684 C109.578851,10.499214 109.997264,6.62484253 109.301672,3.43213272'
+              id='Fill-15'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M108.164017,24.3012978 C105.924782,21.573307 101.852706,24.9591601 103.122505,27.675428 C104.85153,31.3753862 110.454236,27.1147969 108.164017,24.3012978'
+              id='Fill-17'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M94.8984918,28.5446042 C92.0066895,27.8070876 88.6012921,28.3048186 85.6491092,28.3933947 C82.5678984,28.4853064 79.489563,28.6568994 76.4083523,28.7499229 C69.8412367,28.9481999 63.2849033,28.8418345 56.7170689,28.7877252 C44.2631983,28.6854365 31.7816533,29.4770624 19.334252,28.9556122 C16.661689,28.8440582 13.7889353,28.2429265 11.1361398,28.7473286 C10.409056,28.8859372 8.12717022,29.2902742 7.80729649,30.013337 C7.47088995,30.7730903 9.20934979,31.5680517 10.1384213,31.968312 C12.560117,33.0119536 15.4670145,32.8262773 18.0389431,32.9319015 C20.9688428,33.0527208 23.9249793,32.9900875 26.856676,32.9181889 C38.9324486,32.6213292 50.9456841,31.5750933 63.0376301,31.7529868 C70.0126746,31.8560167 76.974421,31.7911597 83.9494655,31.7544692 C87.2686047,31.7366799 90.9489497,32.2799961 94.2217253,31.6922065 C94.773777,31.5928827 97.9847343,30.8375767 98.0293009,29.8561978 C98.0497872,29.4033107 95.2233973,28.6276211 94.8984918,28.5446042'
+              id='Fill-19'
+              fill='#FFFFFF'
+            />
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
+
+export class Deer extends React.Component<Props> {
+  static optionValue = 'Deer'
+  render () {
+    return (
+      <g
+        id='Clothing/Graphic/Deer'
+        mask={`url(#${this.props.maskID})`}
+        fillRule='evenodd'
+        fill='#FFFFFF'>
+        <g transform='translate(77.000000, 58.000000)' id='oh,-deer!'>
+          <path d='M76.9598206,16.2351328 C77.3545748,17.6603319 74.7317873,18.9054413 73.8540158,19.6535687 C72.3474717,20.9370645 70.7886986,22.2879408 69.0287021,23.2010483 C68.2808959,23.5889965 67.4755973,23.9042554 66.6674645,24.1357992 C65.420446,24.4927115 65.5625576,24.2427912 65.0864232,25.3008688 C64.2491394,27.1617948 64.0321258,29.6352706 63.2754123,31.6133978 C61.5708838,36.0670427 57.5083567,46.4138243 51.0084754,41.8719723 C48.9403681,40.4271716 47.8107637,37.6249608 46.6471497,35.4361165 C45.312678,32.9242543 44.0348889,29.927661 43.2668389,27.1858884 C42.8923285,25.8501217 43.1299908,25.3952014 42.1376394,24.7708091 C41.514535,24.3787772 40.4582132,24.2775023 39.7537287,23.9908291 C38.2544724,23.3807295 36.9414591,22.5546042 35.6656945,21.5602318 C34.4279881,20.5948534 29.5561137,16.6096049 33.5340216,15.8696448 C35.3592032,15.5298839 37.7512114,15.6560692 39.6006855,15.7495851 C41.6283052,15.8520851 43.6741443,16.3196647 45.4774626,17.2854514 C47.3184343,18.2720648 46.7783296,17.9862083 48.6865108,17.4345052 C45.3653119,16.3090472 42.0384447,14.4370952 39.8031236,11.6536693 C38.5961879,10.1508806 35.8037572,4.00047299 37.9022302,2.58875006 C40.4225841,0.893212425 40.6331197,7.93508406 41.3416529,9.15569148 C42.9344356,11.8995059 45.8495437,12.9351233 48.3844732,14.454655 C46.6435058,12.7868862 45.3446632,10.9496454 44.7106272,8.58683697 C44.4357163,7.56224546 43.6846711,5.0981621 44.1919809,4.10133952 C44.7207491,3.06123008 45.9641237,2.99507471 46.6499838,3.88041325 C47.2678248,4.67754462 47.1123524,6.5115185 47.3241026,7.47240483 C47.6739156,9.06095045 48.2451958,10.282783 49.3059712,11.5127828 C50.8113007,13.2585495 52.7227209,14.6866071 54.9750468,15.2395353 C60.1015883,16.4977125 61.8947847,11.1317769 62.5826693,6.99461605 C62.7510977,5.98186717 62.5033135,4.30184746 63.6329179,3.81589134 C65.0001846,3.22743524 65.5293577,4.56156854 65.5690356,5.59718594 C65.6564888,7.91058207 64.5127138,11.4535697 63.4029483,13.4419061 C66.1929497,11.7100238 68.4064075,8.96375923 69.3015886,5.75399867 C69.6327773,4.56646894 69.3639395,1.9182123 70.4757294,1.25134983 C72.0154733,0.327216479 72.5049686,2.16772422 72.45112,3.27317229 C72.1324825,9.78825116 67.1525061,15.7132405 60.9627599,17.341806 C62.4810453,18.1005509 62.2814414,18.2716565 63.8114683,17.3650829 C64.6961227,16.840332 65.656084,16.4352324 66.6375037,16.1342663 C68.1076089,15.6834297 69.6931038,15.453111 71.2182722,15.3183501 C72.4377591,15.2105413 76.4921887,14.5012087 76.9598206,16.2351328 Z M58.8595294,24.6214062 C59.7193936,22.4825816 56.3639386,22.4048657 56.0375022,24.7163015 C55.622102,27.6609177 58.7932497,27.8924294 58.8595294,24.6214062 Z M56.9297708,33.6367531 C57.5886752,31.4414328 53.4036129,31.5246305 53.0344702,33.4664333 C52.5980925,35.7582944 56.4400387,35.1974948 56.9297708,33.6367531 Z M51.7024587,27 C54.0260737,27 54.9736078,23.9354052 52.6986912,23.1385385 C49.8083182,22.1255453 48.8835101,27 51.7024587,27 Z' />
+        </g>
+      </g>
+    )
+  }
+}
+
+export class Diamond extends React.Component<Props> {
+  static optionValue = 'Diamond'
+  render () {
+    return (
+      <g
+        id='Clothing/Graphic/Diamond'
+        mask={`url(#${this.props.maskID})`}
+        strokeWidth='1'
+        fillRule='evenodd'>
+        <g transform='translate(77.000000, 58.000000)' id='Diamond'>
+          <g transform='translate(29.000000, 2.000000)'>
+            <path
+              d='M34.7804613,27.7365051 C32.3910217,30.3933795 29.9226048,32.9801662 27.4446301,35.5565142 C28.4300853,32.0044048 29.1846452,27.9785814 30.6489944,24.5994547 C31.0655115,23.6371144 30.7485963,23.5153306 31.576097,23.1057395 C32.1847753,22.8045111 33.6536519,23.1494823 34.3825567,23.1678741 C35.9404713,23.2066461 37.5335988,23.3597457 39.0789374,23.1186635 C37.6281703,24.6436945 36.1869609,26.1712109 34.7804613,27.7365051 M19.5162179,31.798118 C16.8174087,28.5164183 14.1321816,25.2302449 10.8578947,22.4814113 C12.146683,22.6176103 13.5536857,22.4376686 14.8163159,22.687201 C16.7595591,23.0714412 16.6534177,23.6778747 17.6358547,25.6458009 C19.0866218,28.5522078 20.5248129,31.434755 21.6858291,34.4689106 C20.9750337,33.5692019 20.2446197,32.6844056 19.5162179,31.798118 M10.4182378,19.266817 C11.3810563,17.6920783 11.5616476,16.294796 13.3373785,15.4865494 C15.3988361,14.5480688 18.6379102,14.7454082 20.8256308,14.5709343 C19.4553501,16.093977 17.7887788,17.6736865 17.2223558,19.6928116 C16.3480725,17.9749149 15.2599971,16.5189775 13.5521766,15.5223389 C13.3368755,15.4159645 14.7101745,20.0725781 14.8897597,20.3926954 C13.1743936,20.2967597 11.3684803,19.9850926 9.66518708,20.3012334 C9.916204,19.9562622 10.1672209,19.611291 10.4182378,19.266817 M26.8243819,14.2592673 C28.4154971,14.2945597 29.9940364,14.4183318 31.563521,14.6783029 C30.2968665,16.353451 29.9150592,18.3104416 29.4653415,20.3086895 C28.9869505,18.0509676 27.2564932,15.9473394 25.7312761,14.2607585 C26.095477,14.2602615 26.4596779,14.2597644 26.8243819,14.2592673 M23.3257392,15.3334498 C23.5601558,15.1748824 27.7826729,20.4190405 28.3923573,20.889275 C25.0798394,20.8813217 21.7743641,20.7192748 18.4658705,20.5736313 C20.3728949,19.0868752 21.4886374,16.8863171 23.3257392,15.3334498 M26.0124754,32.4289082 C25.6105465,33.7779741 25.2352788,35.1369815 24.797634,36.4756088 C23.2432407,31.7444337 20.9357965,27.288142 18.7898282,22.8020257 C22.1295103,22.8900083 25.465671,23.0107979 28.8058561,23.0575231 C27.9864041,26.2164449 26.9441054,29.3032906 26.0124754,32.4289082 M33.2416622,14.9656131 C34.5188805,16.093977 36.338879,18.4063774 36.9284418,19.1833081 C36.9867944,19.260355 37.0461531,19.3369048 37.1070209,19.4124604 C37.3177947,19.6744198 38.0733606,20.6680759 38.3701542,21.0567898 C36.1426934,20.8306199 33.8251885,20.9270528 31.5901821,20.9066727 C32.0881916,18.8527521 32.6938517,16.8952645 32.1737084,14.7787123 C32.5308668,14.8363732 32.886516,14.8985078 33.2416622,14.9656131 M40.8898811,20.5830758 C38.7323429,17.9068154 36.5199733,13.3247633 33.025858,12.5055811 C29.5538765,11.6918667 25.478247,12.0517501 21.9519372,12.2754346 C18.8773572,12.4702886 13.8690917,12.0721303 11.1572035,13.8690622 C9.76378291,14.7921334 8.73154499,16.8738902 8.2491297,18.4202955 C7.81450321,19.8131041 8.51523782,20.7048596 7.00259677,20.7048596 C6.90651615,20.7048596 9.50672951,24.3777585 9.81308082,24.66656 C12.0853121,26.8064748 14.2574385,28.8688456 16.2701013,31.2642577 C19.1047312,34.6379166 21.6747622,39.6022206 25.414864,41 C24.7292206,40.6609938 28.2067356,38.0334469 28.6242587,37.5811072 C30.7355173,35.2930636 32.8709217,33.0268914 34.9967685,30.7517718 C36.9349813,28.6779682 39.0472459,26.7209776 40.9271061,24.6004489 C42.361776,22.9824645 42.3658003,22.4262358 40.8898811,20.5830758'
+              id='Fill-21'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M6.99858316,11.9999257 C7.04159508,12.0142408 6.09038895,9.95483812 6.17394084,10.0812061 C5.69932656,9.36248835 5.12830624,8.8402333 4.43566602,8.35351923 C3.70792411,7.84261755 0.1270582,7.25421678 0,7 C1.49355183,9.65224611 4.16721231,11.1276907 6.99858316,11.9999257'
+              id='Fill-23'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M22.3553325,7.19614224 C22.5279973,7.84840006 22.7925782,8.44932951 23.1490753,8.99893058 C23.2186566,9.07737584 24.0076748,4.81518326 23.9999436,4.45201075 C23.9866286,3.8317121 23.6120919,0 22.814054,0 C21.4769753,0 22.1397162,6.46931298 22.3553325,7.19614224'
+              id='Fill-25'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M48.969198,5 C45.977552,5 39.2896081,10.8535875 40.0615528,13.9997703 C40.0673207,14.0103781 40.50905,13.6497123 40.4129174,13.7172166 C40.4321439,13.7032335 40.4508897,13.6887683 40.4691549,13.6738209 C41.7405084,12.649202 43.1873037,11.6544779 44.4605798,10.4683308 C45.3723974,9.61874094 46.4476403,8.85642448 47.2772645,7.92727594 C47.3618612,7.83276992 49.2628831,5 48.969198,5'
+              id='Fill-27'
+              fill='#FFFFFF'
+            />
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
+
+export class Hola extends React.Component<Props> {
+  static optionValue = 'Hola'
+  render () {
+    return (
+      <g
+        id='Clothing/Graphic/Hola'
+        mask={`url(#${this.props.maskID})`}
+        fillRule='evenodd'
+        fill='#FFFFFF'>
+        <g transform='translate(77.000000, 58.000000)' id='Hola'>
+          <path d='M74.6371722,16.9479681 C75.917206,22.7098952 73.7328313,28.1917851 69.3072818,31.9519351 C67.2267705,33.7200766 64.8728066,35.0262382 62.2514759,35.7865716 C60.7921156,36.2102906 59.2674351,36.5090512 57.7541146,36.6572104 C56.61811,36.7683298 54.9700918,36.2570992 53.9631048,36.5456839 C52.8441403,36.8672382 51.4050658,38.4111058 50.2065809,38.9084974 C49.535121,39.1873134 48.8385068,39.4319389 48.1390525,39.6350472 C46.6326292,40.0734193 45.0742742,40.3689236 43.5256565,40.611514 C41.9242956,40.8622449 35.2433712,41.9140123 36.070626,38.9752504 C36.3550329,37.9641861 39.1816559,36.4707903 39.7950984,35.791049 C40.2486888,35.288773 42.9398027,32.427347 42.8140307,31.4960606 C42.7742705,31.2021844 41.0666121,29.8650885 40.6657648,29.4157265 C39.7573668,28.3973356 38.9041462,27.3581862 38.4205328,26.0646425 C37.5920608,23.8487672 37.6354724,21.0667121 37.9105478,18.7446017 C38.5986421,12.9407505 41.476791,9.08616941 46.5133487,6.19584415 C49.3679661,4.55795247 52.4720988,3.65678642 55.718232,3.26074551 C59.6739625,2.77841409 62.8279982,2.76294692 66.1848919,5.01097768 C70.6051671,7.97090519 73.4601902,11.6785482 74.6371722,16.9479681 Z M69.5056769,23.9358717 C70.5917785,23.6358901 69.1977385,20.8827342 68.427284,22.2161669 C68.1497742,22.6968702 68.8902058,24.1047895 69.5056769,23.9358717 Z M67.6848238,18.6143519 C67.7728641,18.973353 68.1185341,19.0836583 68.4325583,19.0405131 C69.182727,18.9371273 68.7125023,18.059976 68.7340052,17.6684125 C68.7741711,16.9194759 68.8407085,15.0292252 68.5619816,14.3474487 C68.0491567,13.0942011 67.5866405,13.3339422 67.2884393,14.5615469 C67.0210725,15.6617509 67.4109655,17.5092635 67.6848238,18.6143519 Z M66.6372652,22.892652 C67.4795315,22.3952604 65.2570196,16.7171816 64.7685376,15.9051553 C62.8770898,12.7604359 62.2652702,18.3363499 61.9751833,19.714149 C61.8498171,20.310856 60.4574,26.4960951 62.3135504,24.5020515 C63.3047144,23.4376661 61.755691,19.900162 64.5567538,20.7227711 C65.540615,21.0117629 64.8289892,20.9287287 65.4314774,21.8315228 C65.6517812,22.1616248 65.8887193,23.3326522 66.6372652,22.892652 Z M60.2947079,21.5987013 C61.0809854,20.2481733 57.6303713,20.8778498 57.2327696,20.9022717 C57.3268957,19.1027888 57.6782457,17.2792911 57.6733771,15.4798082 C57.67216,15.0052104 57.8380978,13.2887618 56.7146704,14.0987529 C56.2606742,14.4264127 56.4168749,15.9283561 56.3787376,16.3789391 C56.2886686,17.436405 55.4313908,21.0858425 56.2708171,21.9381649 C56.8660024,22.5421985 59.9640494,22.1587756 60.2947079,21.5987013 Z M55.4961584,19.1587406 C55.8337431,17.8148148 55.4118876,14.9057989 53.6512301,14.8794474 C53.0382604,14.8705068 53.3156518,15.7104604 53.164165,15.7984555 C52.0992431,16.4200683 51.6357538,16.3414844 51.0047261,17.4454234 C48.5177346,21.7957715 54.0705776,24.8897184 55.4961584,19.1587406 Z M49.4685836,22.9899323 C50.2301124,22.7799045 50.0146773,13.0115738 49.1375194,13.0062824 C47.6286618,12.9977348 49.0750392,17.8462849 48.5033854,18.49672 C48.3321733,18.6916877 47.4769241,18.5109661 47.2529689,18.5520762 C46.1129071,18.7637322 45.3623326,18.6444722 45.0126054,17.9464145 C44.7014213,17.3265067 45.3736926,13.0661159 43.7552917,15.1562188 C43.7698975,15.8937585 43.7816632,16.6317052 43.7901833,17.3692449 C44.1261161,18.0843979 44.0007498,18.5195137 43.4136789,18.6754065 C43.3844673,19.14512 43.8056005,19.5387187 43.8108748,19.6921693 C43.8360292,20.4630855 43.3268557,23.9232538 44.7111585,23.7563712 C45.5960249,23.6493221 45.0316741,20.2746303 45.0280226,19.7255458 C46.1705187,19.7532239 47.3673807,19.8806245 48.5033854,19.7336864 C48.5086597,20.1610687 48.2149214,23.3367225 49.4685836,22.9899323 Z M63.8368644,17 C64.2706568,17.6069046 64.6557203,18.2184508 65,18.8421816 C64.3342161,18.8990426 63.6679025,18.9518422 63,19 C63.2722458,18.332463 63.5439619,17.664926 63.8368644,17 Z M53.9230169,17 C54.0684325,17.4229772 54.1789882,20.2877939 52.5679624,19.9763934 C51.6476608,19.7985469 52.0614978,18.2121289 52.3219511,17.8848372 C52.8722396,17.1947521 53.1949428,17.4368397 53.9230169,17 Z' />
+        </g>
+      </g>
+    )
+  }
+}
+
+export class Selena extends React.Component<Props> {
+  static optionValue = 'Selena'
+  render () {
+    return (
+      <g
+        id='Clothing/Graphic/Selena'
+        mask={`url(#${this.props.maskID})`}
+        strokeWidth='1'
+        fillRule='evenodd'>
+        <g transform='translate(77.000000, 58.000000)' id='Selena'>
+          <g transform='translate(17.000000, 0.000000)'>
+            <path
+              d='M65.3033729,7.56759412 C65.1470447,8.49857487 63.3805357,12.656817 62.0741755,10.5184706 C61.5650892,9.68550605 62.4755312,7.05707864 62.7589611,6.30931546 C63.3169849,4.836648 63.7329539,4.67144048 65.0219821,3.97805378 C65.1307322,5.16706304 65.4331933,6.37685313 65.3033729,7.56759412 M62.3188632,10.8866375 C62.3487694,10.8987596 62.4772304,11.018942 62.3188632,10.8866375 M62.3110467,10.8804032 C62.3052694,10.8755544 62.3107069,10.8800569 62.3110467,10.8804032 M55.0298897,6.20471867 C55.040085,6.21337734 55.0829054,6.246973 55.0298897,6.20471867 M42.5545574,11.1605979 C42.3475925,12.3804321 42.0797954,13.5995735 41.6509123,14.760875 C41.48167,13.0294864 41.7542249,11.3046783 42.651413,9.81019097 C42.6412176,10.2618275 42.6089325,10.7120786 42.5545574,11.1605979 M42.544702,8.65858718 C42.5406238,8.64334792 42.3859948,8.41891506 42.544702,8.65858718 M25.9083201,18.8030909 C26.0609101,17.2701591 26.6763675,15.7860622 27.8141651,14.7591433 C27.5371923,16.3838571 26.7416175,17.4294787 25.9083201,18.8030909 M75.8371766,5.29694317 C75.8371766,5.93422166 73.7787416,7.63166832 73.2635382,8.10027581 C72.3850415,8.898952 71.4487714,9.53969396 70.1865909,9.35370562 C66.7252801,8.84422918 68.0968903,5.14766761 67.5456634,2.87251415 C67.1120225,1.08501726 66.6671667,1.75900853 65.4641191,1.64644576 C64.3456926,1.54219531 63.9460361,0.990464532 62.7824103,1.83312679 C60.685573,3.35151205 59.0159196,5.32915344 58.1231495,7.8135005 C57.7992782,6.11813191 56.8776214,3.30960407 54.6706746,3.71967892 C53.0387439,4.02273255 51.6868446,6.64596475 51.0078363,7.96277605 C50.95618,6.76545446 50.3403828,4.88721467 48.8328349,5.74476985 C47.7973303,6.3339061 47.8418499,9.12615564 47.615174,10.1548062 C47.1499276,12.2664839 46.236427,17.7723622 42.9708663,17.056463 C43.999574,15.1377006 46.2510403,9.08632573 44.3207265,7.1194211 C41.6091115,4.35730375 39.5459188,11.2748924 39.4354695,12.9584852 C39.355946,14.1644655 40.2405598,16.9030312 39.7637588,17.6511408 C39.1788873,18.568614 37.3362533,18.9641423 36.4608152,18.2922291 C35.0562401,17.2143972 35.6101858,15.4622277 35.9313383,14.093118 C36.3527448,12.2990405 36.5512137,10.495958 36.6650614,8.65616275 C36.7503623,7.27631629 37.951031,1.10787617 35.6370334,1.02406019 C33.5415555,0.948902892 33.3281335,6.16211798 33.1786022,7.58664321 C32.9944067,9.33812 32.8825981,11.1121094 32.94377,12.8746693 C33.0056216,14.6573173 33.3376491,15.8449412 32.6467463,17.5181435 C31.9065662,19.3108356 28.3834038,24.6889119 26.2743321,21.1180743 C28.5142437,20.1354878 31.1850774,15.5997275 29.9833892,13.0506135 C28.317474,9.51683506 24.5679755,14.9018383 24.024565,16.7073452 C23.1474277,19.6222016 23.5328108,23.4292478 26.8877504,24.3782386 C30.3810066,25.366713 33.0780083,22.0916557 34.309263,19.1975801 C35.3107832,20.7859275 37.1544368,21.1842266 38.8580746,20.7031506 C39.5350438,20.5116207 40.1861848,20.1822447 40.7496461,19.7555452 C41.8198148,18.9457859 41.1934823,19.2471078 42.3292409,19.2142048 C45.6264071,19.1196521 47.4252012,18.0612156 48.660534,14.6690931 C48.6459207,15.6031909 49.0041163,17.0287552 50.2588202,16.5178934 C51.2334927,16.1209797 51.2266958,14.5083881 51.4074928,13.6480621 C51.9774112,10.935126 52.8729,8.10651006 55.0057608,6.22584583 C56.8466956,8.22807786 55.4856205,11.6534497 56.6968244,13.7862546 C58.5635873,17.0737803 59.5035957,11.2537653 59.7962014,10.1319473 C59.8526155,15.0140547 65.6574903,13.2158211 66.9135536,9.97505214 C70.2130987,13.4901279 77.1479547,10.3238236 75.8371766,5.29694317'
+              id='Bom-Bom'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M69.433817,15.3488372 C65.8038135,15.3488372 61.8287631,16.3747039 58.3068219,17.1662556 C54.7602589,17.9637144 51.2314783,18.9518414 47.8046046,20.1368717 C43.9335128,21.4748303 39.9926593,22.6897243 36.2145831,24.2580599 C32.9385178,25.6183343 28.7066484,26.6107275 26.7027087,29.6738881 C26.6986051,29.6824206 28.8051356,29.5856097 28.9754363,29.5573869 C30.0242559,29.3834556 30.9267127,29.0139335 31.8924339,28.6010927 C33.6392127,27.8548288 35.3740227,27.0823111 37.115672,26.3248894 C41.0202768,24.6265975 45.0951823,23.2295678 49.1044296,21.7708418 C53.1003402,20.3176946 57.1991835,19.0860638 61.3588973,18.1455219 C64.7498643,17.3792395 68.5409353,17.2322183 71.6624305,15.8729284 C71.5444511,15.9172317 71.6210523,15.887368 71.8918919,15.7816965 C71.813239,15.8197645 69.6708017,15.3488372 69.433817,15.3488372'
+              id='Bidi'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M22.1170349,20.8250383 C19.8478706,19.8267659 16.6395075,20.267131 14.2823358,20.5862701 C12.1385566,20.8762747 8.78577979,21.5209156 7.44867865,21.6937129 C6.34297926,21.8346967 3.04321074,22.7348497 2.4393915,21.4968044 C1.79003946,20.1656628 5.15878677,16.0935417 5.89512684,15.1341152 C9.20984643,10.8135143 13.1946457,6.01370248 17.9749097,3.21110531 C17.5345328,5.16177188 17.1498826,7.12884748 16.7479027,9.08721625 C16.5824216,9.89460802 15.79851,14.2513757 17.2338124,14.5946261 C17.8233602,14.735275 19.0058537,11.8121216 19.104055,11.5505816 C19.9270433,9.36181652 20.1163103,6.84118695 20.4951839,4.54927932 C20.7119744,3.23789558 21.6953468,0.499260193 19.8009787,0.0471743805 C18.1723317,-0.341619419 15.9646707,1.77447706 14.8776601,2.66558843 C11.5962407,5.35767573 8.75146029,8.61302846 6.0905101,11.8864646 C4.78025293,13.4985691 3.4761121,15.1200503 2.37686886,16.8831849 C1.47300888,18.3332083 -0.712565331,21.3735691 0.232070287,23.1651685 C1.92969602,26.3860287 10.0715716,23.5626691 12.663543,23.133355 C14.708781,22.7941232 16.8162019,22.4729748 18.8913421,22.7566168 C21.0534703,23.0519796 20.9484731,24.0274803 20.2298024,25.953031 C18.7520254,29.9126329 15.4539558,33.3136578 12.5058772,36.2726431 C11.2071731,37.5759898 6.1251694,43.6918736 4.84549395,40.3641872 C3.97595347,38.1030884 4.74525384,35.3289559 5.74561617,33.2503658 C6.21419621,32.2765394 6.8346655,31.3887768 7.32329357,30.4256666 C7.45649398,30.163122 8.12453486,28.0011471 8.27030776,27.9529247 C4.4003599,29.303824 2.15328244,34.538308 1.93751135,38.2397187 C1.83591206,39.9810863 2.07376995,42.5640033 3.73741598,43.6084889 C5.40174162,44.6533095 6.96378836,43.3814414 8.28661802,42.4230195 C11.9289019,39.7838429 15.1780407,36.4246779 18.1519439,33.0879497 C19.7778725,31.2635323 26.6054133,22.8014905 22.1170349,20.8250383'
+              id='Bidi'
+              fill='#FFFFFF'
+            />
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
+
+export class Pizza extends React.Component<Props> {
+  static optionValue = 'Pizza'
+  render () {
+    return (
+      <g
+        id='Clothing/Graphic/Pizza'
+        mask={`url(#${this.props.maskID})`}
+        strokeWidth='1'
+        fillRule='evenodd'>
+        <g transform='translate(77.000000, 58.000000)' id='Group-2'>
+          <g transform='translate(35.000000, 1.000000)'>
+            <path
+              d='M30.9332298,24.3911229 C26.8510636,25.7713262 22.3826909,27.7147062 20.0279438,31.464875 C18.1805823,34.4072634 18.056518,31.0097105 15.4771364,32.0578917 C12.9702973,33.0766532 13.6557418,37.2811459 12.7452506,39.3594362 C12.0367243,38.1679392 11.7020395,36.8427927 10.8096839,35.755105 C11.5033719,35.309607 12.1459503,34.7115469 12.6240715,34.0306915 C12.7802853,33.7116981 7.83173048,34.3791045 7.54774295,34.4602188 C6.13687312,34.8620076 4.80843799,35.231855 3.46021853,35.8900153 C3.8167486,35.3734898 4.16627171,34.8531817 4.51043656,34.3282505 C4.82039102,33.8562748 5.1253994,33.3800962 5.42463735,32.9009757 C5.63196061,32.2209608 6.00126805,32.2188594 6.53255966,32.8950918 C7.28147888,32.931236 7.71055147,33.2519105 8.49450544,33.0724504 C11.4098085,32.4054642 12.3380232,26.8489271 8.74469474,27.0851251 C10.3237313,24.2158656 11.7251212,21.3024766 12.9975007,18.2831768 C13.4999402,22.5742474 19.0774717,21.0961186 20.7166857,18.8076877 C22.8571026,15.8190684 20.1132637,10.1456931 16.2334747,10.6962614 C16.8142272,9.32068116 17.4036352,7.93375334 17.8825808,6.5182464 C18.9752527,8.1287638 20.8844403,8.90880562 22.421023,9.97463863 C24.031797,11.0917459 25.3940304,12.414791 26.5839752,13.9807586 C28.9704596,17.1210994 30.3767956,20.9881063 32.7987269,24.0334636 C32.1610946,24.0675064 31.539537,24.1868662 30.9332298,24.3911229 M39.9388082,20.0029673 C39.306534,14.2455357 34.7895249,8.40194655 30.4996233,4.82661475 C27.9499181,2.7020935 20.2587609,-2.55814545 17.1930146,1.48706068 C19.664819,2.55835735 22.3921709,2.81640998 24.8425422,3.97596569 C28.1630118,5.5482375 30.7646508,8.13506801 33.0114085,11.0312255 C36.1484608,15.075591 40.9816071,23.3139423 33.485408,25.4170292 C34.0030979,25.0791231 34.3035723,24.7080149 34.7132728,24.1086939 C33.706333,23.8762784 34.1131482,22.231298 33.7590912,21.1570594 C33.3473298,19.9063026 32.549362,18.6904293 31.874634,17.5745828 C30.8042195,15.803518 29.6278764,14.0408588 28.3707472,12.4038637 C26.692789,10.2179814 24.685092,8.49735037 22.3938196,7.00829423 C21.4874501,6.41948033 20.6190006,5.89749114 19.5774382,5.59320758 C18.2279822,5.19898385 18.6698322,5.67936522 18.3005247,4.44668058 C18.0692954,3.67420382 18.277443,2.68402141 18.0548693,1.85480669 C16.0817949,3.51323614 15.4400408,5.90967929 14.5555165,8.23635577 C13.5353871,10.9202712 12.4328231,13.5714048 11.3591111,16.2330453 C8.72367389,22.767997 5.32530354,28.6283975 1.46777192,34.479972 C0.796341323,35.4991538 -0.697375374,37.4299255 0.377573066,38.6537842 C1.33876162,39.7486166 2.7084141,38.9597489 3.76399039,38.5150914 C5.20041497,37.9107271 7.14917119,36.3506434 8.69894348,37.1680903 C10.6971605,38.2221554 9.75287108,42.1522045 12.9130052,41.9954397 C16.0265636,41.8407762 15.4404529,36.7154475 16.4395615,34.6775042 C18.7514425,36.3628316 20.615291,35.3171721 22.0187417,33.0665665 C23.6451783,30.4578814 25.7942508,29.4101204 28.5323192,28.1291035 C29.6521946,27.6050129 31.5663282,26.1899262 32.7327792,26.0138284 C33.6980895,25.8688314 34.6254798,26.8972594 35.915995,26.8506082 C39.0138909,26.7375526 40.3077034,22.5977832 39.9388082,20.0029673'
+              id='Fill-29'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M18.5372079,22.8336349 C16.1119296,22.3885123 12.7302873,22.7596628 12.5083803,25.9869094 C12.3721811,27.9648021 13.9174686,29.8351772 15.5900451,30.6510203 C20.7121513,33.1501581 24.6988403,23.9625691 18.5372079,22.8336349'
+              id='Fill-31'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M28.3362306,19.157604 C27.6856351,18.4518413 26.6326311,17.918164 25.6605301,18.1654572 C25.9719227,17.9508815 26.2293799,17.5642204 26.5251817,17.3262751 C23.3686979,15.0403008 21.3853086,20.8049502 23.1786599,23.0743534 C25.8964974,26.5139375 31.2158743,22.3078297 28.3362306,19.157604'
+              id='Fill-33'
+              fill='#FFFFFF'
+            />
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
+
+export class Resist extends React.Component<Props> {
+  static optionValue = 'Resist'
+
+  render () {
+    return (
+      <g
+        id='Clothing/Graphic/Resist'
+        mask={`url(#${this.props.maskID})`}
+        strokeWidth='1'
+        fillRule='evenodd'>
+        <g transform='translate(77.000000, 58.000000)' id='Resist'>
+          <g transform='translate(3.000000, 9.000000)'>
+            <path
+              d='M102.565245,21.0710109 C99.4833509,20.4054313 97.3728781,24.6059197 100.65303,25.85541 C103.46796,26.9271503 105.497722,21.7103865 102.565245,21.0710109'
+              id='!'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M101.191001,18 C104.847558,18 103.499462,12.0185653 103.512139,10.034892 C103.52569,7.89835492 105.057378,1.43936922 102.622588,0.300988793 C98.4060734,-1.67043963 99.5622709,6.62567562 99.5876242,8.26886181 C99.6156003,10.0850565 99.7546063,11.9885455 99.3594446,13.7770905 C99.009744,15.3574722 98.2303489,18 101.191001,18'
+              id='H'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M96.057932,1.97392328 C94.9756601,1.35173361 93.2567577,1.65427333 92.0711316,1.60022061 C90.7220251,1.53916824 89.3807782,1.40539746 88.0356015,1.30662485 C85.8592683,1.14718875 83.080101,0.743543202 80.9175222,1.23857286 C79.6922049,1.51933595 78.5800664,2.46389764 79.1565707,3.84671419 C79.777482,5.33646958 81.4602301,4.95187859 82.7370279,4.87682696 C83.3217848,4.84221766 84.7703158,4.58750876 85.3421043,4.78816493 C86.3390991,5.13853549 85.9154647,4.67967061 86.1430012,5.85522022 C86.491969,7.66229234 86.2825097,9.85512207 86.2675764,11.6929148 C86.2420326,14.8668599 86.2322081,18.0567485 86.1650082,21.2287493 C86.1386784,22.4645735 85.7244756,23.8606116 86.9218911,24.6768466 C87.9196719,25.3569777 89.1379155,24.9023904 89.6550795,23.8835548 C90.1694927,22.8705522 89.6806234,20.8169375 89.6259989,19.6876632 C89.5599779,18.3406226 89.4900272,17.0122476 89.5293254,15.6628738 C89.6330726,12.0775058 89.8110933,8.49563763 89.8971563,4.90910305 C90.8399197,4.95537841 91.8188373,4.92737987 92.7525621,5.05842857 C93.4359574,5.15409023 94.4184119,5.59351169 95.0754775,5.55890239 C96.9743656,5.45818543 97.7689748,2.97175996 96.057932,1.97392328'
+              id='C'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M67.7216119,8.81264097 C67.7100258,8.75972031 67.6397369,8.1691564 67.7216119,8.81264097 M67.6853088,8.53730013 C67.6887847,8.56222653 67.685695,8.5449698 67.6853088,8.53730013 M69.1169633,5.42725256 C72.533315,1.44593148 73.7004204,9.77441647 76.3625176,9.42199554 C80.623109,8.85827545 75.4217272,2.46944776 73.6942412,1.64649312 C70.1786354,-0.0289443454 67.0886252,1.72587411 65.4167525,4.9126183 C63.3188978,8.91234656 64.6466637,11.6208874 68.6751471,13.3572987 C70.1461943,13.9915796 75.714469,15.8848355 74.2051877,18.3157346 C73.4451402,19.5398125 70.6791544,19.6445033 69.5047111,19.402142 C67.1492591,18.916269 67.5161519,17.3159942 66.3699015,15.8288469 C65.3371947,14.4885737 63.3397528,14.8820273 63.028087,16.6100019 C62.7828481,17.9675319 64.198282,20.0348891 65.1433208,20.9897619 C67.3759602,23.2457927 71.1831493,23.4271802 74.0298516,22.3998291 C78.4155727,20.816811 78.9473743,16.6909168 75.8357368,13.4953526 C74.0870096,11.6995014 71.9026455,11.154572 69.7225296,10.0773681 C67.0781977,8.7712248 67.5725376,7.68673472 69.1169633,5.42725256'
+              id='A'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M58.749962,20.5676943 C58.1855671,15.7434329 58.0538346,10.8505093 57.9696387,6.00460433 C57.9426476,4.45075032 58.6758373,0.798596322 56.5169562,0.139962235 C53.6023258,-0.749287073 53.9890632,2.83233897 54.0502966,4.30372379 C54.255348,9.21679823 54.8922562,14.0929294 55.1210758,19.0000333 C55.193992,20.5568726 54.6924419,23.5739018 56.9520358,23.9463193 C59.7027058,24.4000865 58.9598476,21.8648117 58.749962,20.5676943'
+              id='E'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M49.4716454,4.67909741 C47.1120678,1.521124 42.3181606,1.01110068 39.382093,3.92183601 C37.3101733,5.97595969 36.00495,10.8410892 37.9661116,13.3252251 C40.0904751,16.016404 45.3211527,13.6574039 46.6913436,16.7080638 C48.3726748,20.4511421 43.9611374,21.8560762 41.6168232,19.3708027 C40.7738094,18.4774087 40.9581453,16.917382 39.7163241,16.3637507 C37.9539791,15.5788077 36.853443,17.2916519 37.2001979,18.7227508 C38.0479082,22.2235205 41.8524287,24.1130716 45.3011927,23.9947614 C49.0689244,23.8650751 50.7028996,21.0184245 50.4641631,17.5957699 C50.1342371,12.8603265 46.4792204,12.1186123 42.4747091,11.597213 C40.7761576,11.3761397 40.5534673,11.3966165 40.6583549,9.64547322 C40.7855505,7.52650643 42.0277631,5.07763608 44.6491681,5.58159221 C46.7551372,5.98657727 46.942604,9.15327227 49.1037564,9.30040167 C52.5998763,9.53853896 50.3604497,5.86712943 49.4716454,4.67909741'
+              id='P'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M31.7209696,20.4381695 C30.3835461,20.7580967 28.7579173,20.5355712 27.3944988,20.5112208 C26.3407598,20.4924897 22.8201338,20.9379153 22.1329619,20.2148947 C21.3727026,19.4150766 21.6202201,16.9680453 21.5881973,15.9288437 C21.5422351,14.4753101 21.1839563,14.2599024 22.4595946,13.9298603 C23.2085518,13.7361807 24.3674009,13.8332078 25.1415996,13.7976187 C26.6572206,13.727939 28.606845,14.008531 30.0716062,13.7099572 C31.4414292,13.4304891 32.5739067,11.958599 31.3223797,10.7058628 C30.4355361,9.81763391 28.7797682,10.2949024 27.6909924,10.3200021 C25.6573553,10.3664552 23.6222112,10.3555912 21.5881973,10.3915549 C21.5964855,8.82376157 21.5448723,7.2454788 21.6669357,5.68105705 C24.5143291,5.82154032 27.4788884,6.56329201 30.3255283,6.42655496 C31.766555,6.35724988 33.3654353,5.43530497 32.6368221,3.69630934 C32.0121888,2.20606276 30.1149312,2.40985716 28.792954,2.35066687 C27.1398233,2.27611708 25.4848088,2.23790563 23.8313013,2.18096308 C22.6068996,2.13900541 20.8260543,1.73628668 19.6721027,2.28847961 C17.3095724,3.41833976 18.121445,7.29867513 18.1873743,9.39955568 C18.2706336,12.0657409 18.2721406,14.6678658 18.3644416,17.3561538 C18.4484544,19.7885748 18.3271445,22.9972128 21.2159792,23.6808981 C24.1051906,24.364958 27.4611816,23.7142395 30.4084109,23.8565959 C31.6166129,23.9150369 33.2693669,24.2671816 33.8631075,22.8608504 C34.4319834,21.512211 33.1326106,20.086774 31.7209696,20.4381695'
+              id='M'
+              fill='#FFFFFF'
+            />
+            <path
+              d='M8.41021607,5.87934286 C10.7314099,6.38056324 11.3520318,8.89406466 11.4306011,11.0286326 C11.4842397,12.4898438 11.613048,12.4018284 10.4273316,12.768689 C9.23708235,13.1371074 7.50704692,12.9377097 6.28808963,12.8851342 C3.74516418,12.7756991 4.0526421,12.6070678 4.00353629,9.93973422 C3.99220418,9.31505862 3.52947636,6.4362544 3.89625898,6.02967003 C4.37220759,5.5015777 7.73482232,5.8267673 8.41021607,5.87934286 M13.4870013,20.7181143 C12.1966517,19.2140637 10.9010138,17.7773878 9.45277018,16.4318428 C11.6107816,16.3722571 13.9557729,15.9594416 14.7229567,13.6130136 C15.3711534,11.6307201 14.8079476,8.6132722 14.05474,6.74080322 C13.0612917,4.27092005 10.9928039,2.62238402 8.42003723,2.26253349 C6.62389782,2.01172858 2.14242611,1.58956627 0.799948834,2.97327723 C-0.664537495,4.48161175 0.351952758,8.62222952 0.4422319,10.4701632 C0.602014649,13.7411422 0.486049391,16.987586 0.285471047,20.2550599 C0.220500284,21.3096868 -0.296621662,23.0423437 0.243919977,23.9918195 C0.843766325,25.0456674 2.30296434,25.3089347 3.21255502,24.5288691 C4.19693763,23.6845445 3.74176455,22.6513373 3.68132663,21.5678912 C3.58802559,19.8917044 3.75574082,18.1644997 3.85546339,16.4937651 C5.46348977,17.806207 7.10551249,19.0851563 8.61683821,20.5163799 C10.1096548,21.9300785 11.1809169,23.7184265 12.6076296,25.143419 C13.618076,26.1528699 15.4266807,26.5676327 15.9381366,24.6947742 C16.377067,23.0871303 14.3667507,21.7435326 13.4870013,20.7181143'
+              id='I'
+              fill='#FFFFFF'
+            />
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
+
+export class Bear extends React.Component<Props> {
+  static optionValue = 'Bear'
+  private mask1 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, path1 } = this
+    return (
+      <g
+        id='Clothing/Graphic/Bear'
+        mask={`url(#${this.props.maskID})`}
+        strokeWidth='1'
+        fillRule='evenodd'>
+        <defs>
+          <polygon
+            id={path1}
+            points='47.8916289 0.430054064 47.8916289 41.9204613 0.45345556 41.9204613 0.45345556 0.430054064 47.8916289 0.430054064'
+          />
+        </defs>
+        <g transform='translate(77.000000, 58.000000)' id='Group-76'>
+          <g transform='translate(31.000000, 1.000000)'>
+            <mask id={mask1} fill='white'>
+              <use xlinkHref={'#' + path1} />
+            </mask>
+            <path
+              d='M34.4465814,31.5861741 C33.968066,34.4016565 30.3675711,38.9307388 27.2995299,35.97048 C23.8326433,32.6262918 31.5245196,31.1602447 28.7810969,28.3763859 C27.5974268,27.1761741 24.3685608,27.83928 22.7791175,27.96528 C21.289633,28.0833741 18.9133856,28.4198682 19.4834474,30.5900329 C19.9159423,32.2398918 21.1926433,31.5342918 21.8715711,32.4815153 C22.4069938,33.2301035 22.1798598,35.9887624 21.3826639,36.7492094 C20.3796124,37.7053271 19.193468,37.4123153 17.7975093,36.7996094 C14.6057567,35.39928 13.1212206,31.4868565 15.2228289,28.5829271 C19.3780454,22.8417741 35.2897979,21.5244565 34.4465814,31.5861741 M14.9853031,14.7244094 C15.9695505,14.2811859 17.132932,14.5213271 17.7173443,15.5110447 C18.5189938,16.8669035 17.3595711,18.6842682 15.7424165,18.4668565 C14.0347052,18.2365976 13.1726845,15.5481035 14.9853031,14.7244094 M32.9472,16.3787153 C32.0911175,19.3854212 27.3109113,16.0012094 30.0112825,14.08848 C31.5626227,12.9900565 33.4583753,14.5801271 32.9472,16.3787153 M47.8267052,23.16888 C47.5911588,20.7887153 46.9270763,18.5231859 45.7389526,16.4385035 C45.1164371,15.3460094 44.3464577,14.3276329 43.5492619,13.35768 C43.2483959,12.9930212 42.6432,12.34968 42.5264165,12.1446212 C41.8173031,10.90488 41.888066,11.7834212 42.2789938,10.3598682 C42.8950763,8.11657412 44.2262103,6.28043294 43.1627876,3.87062118 C42.1735918,1.62930353 39.5078598,0.576832941 37.1791175,0.443915294 C36.0914474,0.382150588 35.0017979,0.525938824 33.9720247,0.892574118 C32.9368082,1.26069176 31.9708701,2.53255059 31.0717361,2.79393882 C30.3740041,2.99702118 28.3872,2.33391529 27.6305814,2.28549176 C26.2356124,2.19605647 24.8332206,2.23558588 23.4387464,2.31859765 C21.8087258,2.41544471 18.0632412,3.58205647 16.5257567,3.19565647 C15.5108289,2.94069176 14.3172619,1.41485647 13.1449732,1.03191529 C11.852932,0.610432941 10.4673649,0.467632941 9.17829278,0.954338824 C6.89260206,1.81805647 5.17845773,4.50605647 5.12501443,6.89560941 C5.09680825,8.15066824 5.78018969,9.01092706 5.91528247,10.1469035 C6.11816907,11.8619859 6.35223093,10.5026682 5.42835464,11.8718682 C4.9577567,12.5690682 4.13284948,13.1822682 3.60385979,13.8537741 C0.778787629,17.4405741 -0.278696907,22.73208 0.974746392,27.0733976 C4.13284948,38.0131624 14.6423753,42.4676329 25.4136742,41.86728 C34.6648082,41.3509271 48.9782103,34.1491624 47.8267052,23.16888'
+              id='Fill-74'
+              fill='#FFFFFF'
+              mask={`url(#${mask1})`}
+            />
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
+
+export default class Graphics extends React.Component<Props> {
+  render () {
+    return (
+      <Selector option={GraphicOption} defaultOption={Skull}>
+        <Bat maskID={this.props.maskID} />
+        <Cumbia maskID={this.props.maskID} />
+        <Deer maskID={this.props.maskID} />
+        <Diamond maskID={this.props.maskID} />
+        <Hola maskID={this.props.maskID} />
+        <Pizza maskID={this.props.maskID} />
+        <Resist maskID={this.props.maskID} />
+        <Selena maskID={this.props.maskID} />
+        <Bear maskID={this.props.maskID} />
+        <SkullOutline maskID={this.props.maskID} />
+        <Skull maskID={this.props.maskID} />
+      </Selector>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/Hoodie.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/Hoodie.tsx
new file mode 100644
index 000000000..d4e777678
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/Hoodie.tsx
@@ -0,0 +1,50 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import Colors from './Colors'
+
+export default class Hoodie extends React.Component {
+  static optionValue = 'Hoodie'
+
+  private path1 = uniqueId('react-path-')
+  private mask1 = uniqueId('react-mask-')
+
+  render () {
+    const { path1, mask1 } = this
+    return (
+      <g id='Clothing/Hoodie' transform='translate(0.000000, 170.000000)'>
+        <defs>
+          <path
+            d='M108,13.0708856 C90.0813006,15.075938 76.2798424,20.5518341 76.004203,34.6449676 C50.1464329,45.5680933 32,71.1646257 32,100.999485 L32,100.999485 L32,110 L232,110 L232,100.999485 C232,71.1646257 213.853567,45.5680933 187.995797,34.6449832 C187.720158,20.5518341 173.918699,15.075938 156,13.0708856 L156,32 L156,32 C156,45.254834 145.254834,56 132,56 L132,56 C118.745166,56 108,45.254834 108,32 L108,13.0708856 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <use
+          id='Hoodie'
+          fill='#B7C1DB'
+          fillRule='evenodd'
+          xlinkHref={'#' + path1}
+        />
+        <Colors maskID={mask1} />
+        <path
+          d='M102,61.7390531 L102,110 L95,110 L95,58.1502625 C97.2037542,59.4600576 99.5467694,60.6607878 102,61.7390531 Z M169,58.1502625 L169,98.5 C169,100.432997 167.432997,102 165.5,102 C163.567003,102 162,100.432997 162,98.5 L162,61.7390531 C164.453231,60.6607878 166.796246,59.4600576 169,58.1502625 Z'
+          id='Straps'
+          fill='#F4F4F4'
+          fillRule='evenodd'
+          mask={`url(#${mask1})`}
+        />
+        <path
+          d='M90.9601329,12.7243537 C75.9093095,15.5711782 65.5,21.2428847 65.5,32.3076923 C65.5,52.0200095 98.5376807,68 132,68 C165.462319,68 198.5,52.0200095 198.5,32.3076923 C198.5,21.2428847 188.09069,15.5711782 173.039867,12.7243537 C182.124921,16.0744598 188,21.7060546 188,31.0769231 C188,51.4689754 160.178795,68 132,68 C103.821205,68 76,51.4689754 76,31.0769231 C76,21.7060546 81.8750795,16.0744598 90.9601329,12.7243537 Z'
+          id='Shadow'
+          fillOpacity='0.16'
+          fill='#000000'
+          fillRule='evenodd'
+          mask={`url(#${mask1})`}
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/Overall.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/Overall.tsx
new file mode 100644
index 000000000..e18ae6710
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/Overall.tsx
@@ -0,0 +1,51 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import Colors from './Colors'
+
+export default class Overall extends React.Component {
+  static optionValue = 'Overall'
+
+  private path1 = uniqueId('react-path-')
+  private mask1 = uniqueId('react-mask-')
+
+  render () {
+    const { path1, mask1 } = this
+    return (
+      <g id='Clothing/Overall' transform='translate(0.000000, 170.000000)'>
+        <defs>
+          <path
+            d='M94,29.6883435 L94,74 L170,74 L170,29.6883435 C179.362956,30.9893126 188.149952,34.0907916 196.00002,38.6318143 L196,110 L187,110 L77,110 L68,110 L68,38.6318027 C75.8500482,34.0907916 84.6370437,30.9893126 94,29.6883435 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <use
+          id='Overall'
+          fill='#B7C1DB'
+          fillRule='evenodd'
+          xlinkHref={'#' + path1}
+        />
+        <Colors maskID={mask1} />
+        <circle
+          id='Button'
+          fill='#F4F4F4'
+          fillRule='evenodd'
+          cx='81'
+          cy='83'
+          r='5'
+        />
+        <circle
+          id='Button'
+          fill='#F4F4F4'
+          fillRule='evenodd'
+          cx='183'
+          cy='83'
+          r='5'
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/ShirtCrewNeck.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/ShirtCrewNeck.tsx
new file mode 100644
index 000000000..6ac9f9462
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/ShirtCrewNeck.tsx
@@ -0,0 +1,53 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import Colors from './Colors'
+
+export default class ShirtCrewNeck extends React.Component {
+  static optionValue = 'ShirtCrewNeck'
+  private path1 = uniqueId('react-path-')
+  private mask1 = uniqueId('react-mask-')
+
+  render () {
+    const { path1, mask1 } = this
+    return (
+      <g
+        id='Clothing/Shirt-Crew-Neck'
+        transform='translate(0.000000, 170.000000)'>
+        <defs>
+          <path
+            d='M165.960472,29.2949161 C202.936473,32.3249982 232,63.2942856 232,101.051724 L232,110 L32,110 L32,101.051724 C32,62.9525631 61.591985,31.7649812 99.0454063,29.2195264 C99.0152598,29.5931145 99,29.9692272 99,30.3476251 C99,42.2107177 113.998461,51.8276544 132.5,51.8276544 C151.001539,51.8276544 166,42.2107177 166,30.3476251 C166,29.9946691 165.986723,29.6437014 165.960472,29.2949161 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <use
+          id='Clothes'
+          fill='#E6E6E6'
+          fillRule='evenodd'
+          xlinkHref={'#' + path1}
+        />
+        <Colors maskID={mask1} />
+        <g
+          id='Shadowy'
+          opacity='0.599999964'
+          strokeWidth='1'
+          fillRule='evenodd'
+          mask={`url(#${mask1})`}
+          fillOpacity='0.16'
+          fill='#000000'>
+          <g transform='translate(92.000000, 4.000000)' id='Hola-👋🏼'>
+            <ellipse
+              cx='40.5'
+              cy='27.8476251'
+              rx='39.6351047'
+              ry='26.9138272'
+            />
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/ShirtScoopNeck.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/ShirtScoopNeck.tsx
new file mode 100644
index 000000000..ea3d3a6d0
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/ShirtScoopNeck.tsx
@@ -0,0 +1,36 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import Colors from './Colors'
+
+export default class ShirtScoopNeck extends React.Component {
+  static optionValue = 'ShirtScoopNeck'
+  private path1 = uniqueId('react-path-')
+  private mask1 = uniqueId('react-mask-')
+
+  render () {
+    const { path1, mask1 } = this
+    return (
+      <g
+        id='Clothing/Shirt-Scoop-Neck'
+        transform='translate(0.000000, 170.000000)'>
+        <defs>
+          <path
+            d='M181.544255,32.3304167 C210.784209,41.4878872 232,68.7921987 232,101.051724 L232,110 L32,110 L32,101.051724 C32,68.3969699 53.7388273,40.8195914 83.5340368,32.0020332 C83.182234,33.4201865 83,34.8712315 83,36.3476251 C83,52.6289957 105.161905,65.8276544 132.5,65.8276544 C159.838095,65.8276544 182,52.6289957 182,36.3476251 C182,34.9849859 181.844766,33.6439396 181.544255,32.3304167 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <use
+          id='Clothes'
+          fill='#E6E6E6'
+          fillRule='evenodd'
+          xlinkHref={'#' + path1}
+        />
+        <Colors maskID={mask1} />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/ShirtVNeck.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/ShirtVNeck.tsx
new file mode 100644
index 000000000..656781402
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/ShirtVNeck.tsx
@@ -0,0 +1,34 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import Colors from './Colors'
+
+export default class ShirtVNeck extends React.Component {
+  static optionValue = 'ShirtVNeck'
+  private path1 = uniqueId('react-path-')
+  private mask1 = uniqueId('react-mask-')
+
+  render () {
+    const { path1, mask1 } = this
+    return (
+      <g id='Clothing/Shirt-V-Neck' transform='translate(0.000000, 170.000000)'>
+        <defs>
+          <path
+            d='M171.319631,29.9364358 C205.706337,35.3665707 232,65.13854 232,101.051724 L232,110 L32,110 L32,101.051724 C32,65.1380521 58.2943778,35.3657617 92.6817711,29.9362145 C93.5835973,35.0053598 96.116393,39.8238432 100.236125,43.5389794 L100.236125,43.5389794 L129.321203,69.7676333 C130.843316,71.1402598 133.156684,71.1402598 134.678797,69.7676333 L134.678797,69.7676333 L163.763875,43.5389794 C164.189462,43.1551884 164.601167,42.7562772 164.998197,42.3430127 C168.414164,38.7873666 170.517305,34.4520434 171.319628,29.9364354 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <use
+          id='Clothes'
+          fill='#E6E6E6'
+          fillRule='evenodd'
+          xlinkHref={'#' + path1}
+        />
+        <Colors maskID={mask1} />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/index.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/index.tsx
new file mode 100644
index 000000000..9958a480e
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/clothes/index.tsx
@@ -0,0 +1,30 @@
+import * as React from 'react'
+
+import BlazerShirt from './BlazerShirt'
+import BlazerSweater from './BlazerSweater'
+import CollarSweater from './CollarSweater'
+import GraphicShirt from './GraphicShirt'
+import Hoodie from './Hoodie'
+import Overall from './Overall'
+import ShirtCrewNeck from './ShirtCrewNeck'
+import ShirtScoopNeck from './ShirtScoopNeck'
+import ShirtVNeck from './ShirtVNeck'
+import { ClotheOption, Selector } from '../../options'
+
+export default class Clothes extends React.Component {
+  render () {
+    return (
+      <Selector option={ClotheOption} defaultOption={BlazerShirt}>
+        <BlazerShirt />
+        <BlazerSweater />
+        <CollarSweater />
+        <GraphicShirt />
+        <Hoodie />
+        <Overall />
+        <ShirtCrewNeck />
+        <ShirtScoopNeck />
+        <ShirtVNeck />
+      </Selector>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/Angry.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/Angry.tsx
new file mode 100644
index 000000000..c04f4bc32
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/Angry.tsx
@@ -0,0 +1,24 @@
+import * as React from 'react'
+
+export default class Angry extends React.Component {
+  static optionValue = 'Angry'
+
+  render () {
+    return (
+      <g
+        id='Eyebrow/Outline/Angry'
+        fillOpacity='0.599999964'
+        fillRule='nonzero'>
+        <path
+          d='M15.6114904,15.1845247 C19.8515017,9.41618792 22.4892046,9.70087612 28.9238518,14.5564693 C29.1057771,14.6937504 29.2212592,14.7812575 29.5936891,15.063789 C34.4216439,18.7263562 36.7081807,20 40,20 C41.1045695,20 42,19.1045695 42,18 C42,16.8954305 41.1045695,16 40,16 C37.9337712,16 36.0986396,14.9777974 32.011227,11.8770179 C31.6358269,11.5922331 31.5189458,11.5036659 31.3332441,11.3635351 C27.5737397,8.52660822 25.3739873,7.28738405 22.6379899,6.99208688 C18.9538127,6.59445233 15.5799484,8.47367246 12.3885096,12.8154753 C11.7343147,13.7054768 11.9254737,14.9572954 12.8154753,15.6114904 C13.7054768,16.2656853 14.9572954,16.0745263 15.6114904,15.1845247 Z'
+          id='Eyebrow'
+        />
+        <path
+          d='M73.6114904,15.1845247 C77.8515017,9.41618792 80.4892046,9.70087612 86.9238518,14.5564693 C87.1057771,14.6937504 87.2212592,14.7812575 87.5936891,15.063789 C92.4216439,18.7263562 94.7081807,20 98,20 C99.1045695,20 100,19.1045695 100,18 C100,16.8954305 99.1045695,16 98,16 C95.9337712,16 94.0986396,14.9777974 90.011227,11.8770179 C89.6358269,11.5922331 89.5189458,11.5036659 89.3332441,11.3635351 C85.5737397,8.52660822 83.3739873,7.28738405 80.6379899,6.99208688 C76.9538127,6.59445233 73.5799484,8.47367246 70.3885096,12.8154753 C69.7343147,13.7054768 69.9254737,14.9572954 70.8154753,15.6114904 C71.7054768,16.2656853 72.9572954,16.0745263 73.6114904,15.1845247 Z'
+          id='Eyebrow'
+          transform='translate(84.999934, 13.470064) scale(-1, 1) translate(-84.999934, -13.470064) '
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/AngryNatural.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/AngryNatural.tsx
new file mode 100644
index 000000000..8792b50ac
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/AngryNatural.tsx
@@ -0,0 +1,22 @@
+import * as React from 'react'
+
+export default class AngryNatural extends React.Component {
+  static optionValue = 'AngryNatural'
+
+  render () {
+    return (
+      <g id='Eyebrow/Natural/Angry-Natural' fillOpacity='0.599999964'>
+        <path
+          d='M44.8565785,12.2282877 C44.8578785,12.2192877 44.8578785,12.2192877 44.8565785,12.2282877 M17.5862288,7.89238094 C15.2441598,8.3302947 13.0866155,9.78806858 12.1523766,12.0987479 C11.8009169,12.967391 11.3917103,14.9243181 11.7083227,15.8073302 C11.8284629,16.14295 12.0332321,16.1008692 12.9555234,16.0430509 C14.643791,15.9369937 16.9330912,13.6622369 18.7484684,13.2557982 C21.2753939,12.6899315 23.9825295,13.1148447 26.4961798,13.6882381 C30.8109365,14.6725177 36.4854008,17.7875215 40.9461842,16.1699775 C41.2783949,16.0495512 45.6210294,12.9225732 44.3685187,12.2769925 C43.9238011,11.9068186 41.1370145,12.0854053 40.6216067,11.9988489 C38.2277647,11.5971998 35.7297127,10.9345131 33.373373,10.3265657 C28.2329017,9.00016592 22.9666484,6.88073171 17.5862288,7.89238094'
+          id='Eyebrows-The-Web'
+          transform='translate(28.094701, 12.127505) rotate(17.000000) translate(-28.094701, -12.127505) '
+        />
+        <path
+          d='M100.918293,12.2094196 C100.919593,12.2004196 100.919593,12.2004196 100.918293,12.2094196 M73.5862288,7.89238094 C71.2441598,8.3302947 69.0866155,9.78806858 68.1523766,12.0987479 C67.8009169,12.967391 67.3917103,14.9243181 67.7083227,15.8073302 C67.8284629,16.14295 68.0332321,16.1008692 68.9555234,16.0430509 C70.643791,15.9369937 72.9330912,13.6622369 74.7484684,13.2557982 C77.2753939,12.6899315 79.9825295,13.1148447 82.4961798,13.6882381 C86.8109365,14.6725177 92.4854008,17.7875215 96.9461842,16.1699775 C97.2783949,16.0495512 101.621029,12.9225732 100.368519,12.2769925 C99.9238011,11.9068186 97.1370145,12.0854053 96.6216067,11.9988489 C94.2277647,11.5971998 91.7297127,10.9345131 89.373373,10.3265657 C84.2329017,9.00016592 78.9666484,6.88073171 73.5862288,7.89238094'
+          id='Eyebrows-The-Web'
+          transform='translate(84.094701, 12.127505) scale(-1, 1) rotate(17.000000) translate(-84.094701, -12.127505) '
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/Default.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/Default.tsx
new file mode 100644
index 000000000..6351a4871
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/Default.tsx
@@ -0,0 +1,25 @@
+import * as React from 'react'
+
+export default class Default extends React.Component {
+  static optionValue = 'Default'
+
+  render () {
+    return (
+      <g id='Eyebrow/Outline/Default' fillOpacity='0.599999964'>
+        <g id='I-Browse' transform='translate(12.000000, 6.000000)'>
+          <path
+            d='M3.63024536,11.1585767 C7.54515501,5.64986673 18.2779197,2.56083721 27.5230268,4.83118046 C28.5957248,5.0946055 29.6788665,4.43856013 29.9422916,3.36586212 C30.2057166,2.2931641 29.5496712,1.21002236 28.4769732,0.94659732 C17.7403633,-1.69001789 5.31209962,1.88699832 0.369754639,8.84142326 C-0.270109626,9.74178291 -0.0589363917,10.9903811 0.84142326,11.6302454 C1.74178291,12.2701096 2.9903811,12.0589364 3.63024536,11.1585767 Z'
+            id='Eyebrow'
+            fillRule='nonzero'
+          />
+          <path
+            d='M61.6302454,11.1585767 C65.545155,5.64986673 76.2779197,2.56083721 85.5230268,4.83118046 C86.5957248,5.0946055 87.6788665,4.43856013 87.9422916,3.36586212 C88.2057166,2.2931641 87.5496712,1.21002236 86.4769732,0.94659732 C75.7403633,-1.69001789 63.3120996,1.88699832 58.3697546,8.84142326 C57.7298904,9.74178291 57.9410636,10.9903811 58.8414233,11.6302454 C59.7417829,12.2701096 60.9903811,12.0589364 61.6302454,11.1585767 Z'
+            id='Eyebrow'
+            fillRule='nonzero'
+            transform='translate(73.000154, 6.039198) scale(-1, 1) translate(-73.000154, -6.039198) '
+          />
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/DefaultNatural.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/DefaultNatural.tsx
new file mode 100644
index 000000000..f498ca105
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/DefaultNatural.tsx
@@ -0,0 +1,22 @@
+import * as React from 'react'
+
+export default class DefaultNatural extends React.Component {
+  static optionValue = 'DefaultNatural'
+
+  render () {
+    return (
+      <g id='Eyebrow/Natural/Default-Natural' fillOpacity='0.599999964'>
+        <path
+          d='M26.0390934,6.21012364 C20.2775554,6.98346216 11.2929313,12.0052479 12.04426,17.8178111 C12.0689481,18.0080543 12.3567302,18.0673468 12.4809077,17.9084937 C14.9674041,14.7203351 34.1927973,10.0365481 41.1942673,11.0147151 C41.8350523,11.1044465 42.2580662,10.4430343 41.8210501,10.0302067 C38.0765663,6.49485426 31.2003792,5.51224825 26.0390934,6.21012364'
+          id='Eyebrow'
+          transform='translate(27.000000, 12.000000) rotate(5.000000) translate(-27.000000, -12.000000) '
+        />
+        <path
+          d='M85.0390934,6.21012364 C79.2775554,6.98346216 70.2929313,12.0052479 71.04426,17.8178111 C71.0689481,18.0080543 71.3567302,18.0673468 71.4809077,17.9084937 C73.9674041,14.7203351 93.1927973,10.0365481 100.194267,11.0147151 C100.835052,11.1044465 101.258066,10.4430343 100.82105,10.0302067 C97.0765663,6.49485426 90.2003792,5.51224825 85.0390934,6.21012364'
+          id='Eyebrow'
+          transform='translate(86.000000, 12.000000) scale(-1, 1) rotate(5.000000) translate(-86.000000, -12.000000) '
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/FlatNatural.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/FlatNatural.tsx
new file mode 100644
index 000000000..c4c735206
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/FlatNatural.tsx
@@ -0,0 +1,22 @@
+import * as React from 'react'
+
+export default class FlatNatural extends React.Component {
+  static optionValue = 'FlatNatural'
+
+  render () {
+    return (
+      <g id='Eyebrow/Natural/Flat-Natural' fillOpacity='0.599999964'>
+        <path
+          d='M38.5686071,10.7022978 C33.5865557,11.2384494 28.6553385,11.1338998 23.6562444,11.1010606 C19.8231061,11.0762636 15.91974,10.6892291 12.3246118,12.5091287 C11.6361455,12.8572921 7.8767609,14.9449324 8.00311195,16.0108688 C8.10389896,16.8633498 12.0128479,18.0636592 12.7165939,18.2838164 C16.4280826,19.4452548 19.9241869,18.9282036 23.6870976,18.5703225 C28.3024371,18.1316834 32.9139567,18.1745756 37.5322346,17.8739956 C40.6422336,17.6719334 45.4224171,16.9769469 46.8293214,13.1484895 C47.2530382,11.9954284 46.8152171,9.73353891 46.3074622,8.50642195 C46.1050066,8.01751871 45.5634602,7.84963624 45.1688335,8.14921095 C43.7560524,9.22218432 40.9851444,10.4425994 38.5686071,10.7022978'
+          id='Fill-10'
+          transform='translate(27.500000, 13.500000) rotate(2.000000) translate(-27.500000, -13.500000) '
+        />
+        <path
+          d='M95.5686071,10.7022978 C90.5865557,11.2384494 85.6553385,11.1338998 80.6562444,11.1010606 C76.8231061,11.0762636 72.91974,10.6892291 69.3246118,12.5091287 C68.6361455,12.8572921 64.8767609,14.9449324 65.003112,16.0108688 C65.103899,16.8633498 69.0128479,18.0636592 69.7165939,18.2838164 C73.4280826,19.4452548 76.9241869,18.9282036 80.6870976,18.5703225 C85.3024371,18.1316834 89.9139567,18.1745756 94.5322346,17.8739956 C97.6422336,17.6719334 102.422417,16.9769469 103.829321,13.1484895 C104.253038,11.9954284 103.815217,9.73353891 103.307462,8.50642195 C103.105007,8.01751871 102.56346,7.84963624 102.168833,8.14921095 C100.756052,9.22218432 97.9851444,10.4425994 95.5686071,10.7022978'
+          id='Fill-10'
+          transform='translate(84.500000, 13.500000) scale(-1, 1) rotate(2.000000) translate(-84.500000, -13.500000) '
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/FrownNatural.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/FrownNatural.tsx
new file mode 100644
index 000000000..726bfcb30
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/FrownNatural.tsx
@@ -0,0 +1,21 @@
+import * as React from 'react'
+
+export default class FrownNatural extends React.Component {
+  static optionValue = 'FrownNatural'
+
+  render () {
+    return (
+      <g id='Eyebrow/Natural/Frown-Natural' fillOpacity='0.599999964'>
+        <path
+          d='M36.3692975,6.87618545 C34.3991755,9.78053246 30.8236346,11.5165625 27.6315757,12.5601676 C23.6890255,13.8490851 9.08080143,15.9390364 12.5196198,23.9079177 C12.572332,24.029546 12.7390347,24.0312591 12.7920764,23.9096308 C13.9448284,21.2646433 30.256648,18.7865093 31.7648785,18.2064622 C36.2101722,16.4974987 40.1579937,12.7153722 40.9269343,7.66282939 C41.2794477,5.34640965 40.2901039,1.6143049 39.3791695,0.113308759 C39.2697915,-0.0669067099 39.0052417,-0.02339461 38.9498938,0.181831751 C38.5898029,1.51323348 37.5385221,5.15317482 36.3692975,6.87618545'
+          id='Fill-5'
+        />
+        <path
+          d='M95.3692975,6.87618545 C93.3991755,9.78053246 89.8236346,11.5165625 86.6315757,12.5601676 C82.6890255,13.8490851 68.0808014,15.9390364 71.5196198,23.9079177 C71.572332,24.029546 71.7390347,24.0312591 71.7920764,23.9096308 C72.9448284,21.2646433 89.256648,18.7865093 90.7648785,18.2064622 C95.2101722,16.4974987 99.1579937,12.7153722 99.9269343,7.66282939 C100.279448,5.34640965 99.2901039,1.6143049 98.3791695,0.113308759 C98.2697915,-0.0669067099 98.0052417,-0.02339461 97.9498938,0.181831751 C97.5898029,1.51323348 96.5385221,5.15317482 95.3692975,6.87618545'
+          id='Fill-5'
+          transform='translate(85.500000, 12.000000) scale(-1, 1) translate(-85.500000, -12.000000) '
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/RaisedExcited.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/RaisedExcited.tsx
new file mode 100644
index 000000000..030633f55
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/RaisedExcited.tsx
@@ -0,0 +1,25 @@
+import * as React from 'react'
+
+export default class RaisedExcited extends React.Component {
+  static optionValue = 'RaisedExcited'
+
+  render () {
+    return (
+      <g id='Eyebrow/Outline/Raised-Excited' fillOpacity='0.599999964'>
+        <g id='I-Browse' transform='translate(12.000000, 0.000000)'>
+          <path
+            d='M3.97579559,17.1279169 C5.47099148,7.60476158 18.0585488,1.10867597 27.1635167,5.30104271 C28.1668367,5.76301969 29.3546946,5.32417444 29.8166716,4.32085442 C30.2786486,3.3175344 29.8398033,2.12967649 28.8364833,1.66769952 C17.3488212,-3.62177466 1.93575948,4.3324746 0.0242044059,16.507492 C-0.147121205,17.5986938 0.598585765,18.6221744 1.68978754,18.7935 C2.78098932,18.9648257 3.80446998,18.2191187 3.97579559,17.1279169 Z'
+            id='Eyebrow'
+            fillRule='nonzero'
+          />
+          <path
+            d='M61.9757956,17.1279169 C63.4709915,7.60476158 76.0585488,1.10867597 85.1635167,5.30104271 C86.1668367,5.76301969 87.3546946,5.32417444 87.8166716,4.32085442 C88.2786486,3.3175344 87.8398033,2.12967649 86.8364833,1.66769952 C75.3488212,-3.62177466 59.9357595,4.3324746 58.0242044,16.507492 C57.8528788,17.5986938 58.5985858,18.6221744 59.6897875,18.7935 C60.7809893,18.9648257 61.80447,18.2191187 61.9757956,17.1279169 Z'
+            id='Eyebrow'
+            fillRule='nonzero'
+            transform='translate(73.000097, 9.410436) scale(-1, 1) translate(-73.000097, -9.410436) '
+          />
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/RaisedExcitedNatural.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/RaisedExcitedNatural.tsx
new file mode 100644
index 000000000..28144d913
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/RaisedExcitedNatural.tsx
@@ -0,0 +1,21 @@
+import * as React from 'react'
+
+export default class RaisedExcitedNatural extends React.Component {
+  static optionValue = 'RaisedExcitedNatural'
+
+  render () {
+    return (
+      <g id='Eyebrow/Natural/Raised-Excited-Natural' fillOpacity='0.599999964'>
+        <path
+          d='M22.7663531,1.57844898 L23.6772984,1.17582144 C28.9190996,-0.905265751 36.8645466,-0.0328729562 41.7227321,2.29911638 C42.2897848,2.57148957 41.9021563,3.4519421 41.3211012,3.40711006 C26.4021788,2.25602197 16.3582869,11.5525942 12.9460869,17.8470939 C12.8449215,18.0337142 12.5391523,18.05489 12.4635344,17.8808353 C10.156283,12.5620676 16.9134476,3.89614725 22.7663531,1.57844898 Z'
+          id='Eye-Browse-Reddit'
+        />
+        <path
+          d='M80.7663531,1.57844898 L81.6772984,1.17582144 C86.9190996,-0.905265751 94.8645466,-0.0328729562 99.7227321,2.29911638 C100.289785,2.57148957 99.9021563,3.4519421 99.3211012,3.40711006 C84.4021788,2.25602197 74.3582869,11.5525942 70.9460869,17.8470939 C70.8449215,18.0337142 70.5391523,18.05489 70.4635344,17.8808353 C68.156283,12.5620676 74.9134476,3.89614725 80.7663531,1.57844898 Z'
+          id='Eye-Browse-Reddit'
+          transform='translate(85.000000, 9.000000) scale(-1, 1) translate(-85.000000, -9.000000) '
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/SadConcerned.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/SadConcerned.tsx
new file mode 100644
index 000000000..e1aefe636
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/SadConcerned.tsx
@@ -0,0 +1,25 @@
+import * as React from 'react'
+
+export default class SadConcerned extends React.Component {
+  static optionValue = 'SadConcerned'
+
+  render () {
+    return (
+      <g
+        id='Eyebrow/Outline/Sad-Concerned'
+        fillOpacity='0.599999964'
+        fillRule='nonzero'>
+        <path
+          d='M15.9726042,19.4088529 C17.452356,11.0203704 30.0622688,5.22829657 39.2106453,8.9774793 C40.2254706,9.39337449 41.4016967,8.94600219 41.8378196,7.97824531 C42.2739426,7.01048842 41.8048116,5.88881678 40.7899862,5.47292159 C29.3457328,0.782843812 13.9550264,7.85221132 12.0280273,18.7760684 C11.84479,19.8148122 12.5792704,20.798534 13.6685352,20.9732726 C14.7578,21.1480113 15.7893668,20.4475967 15.9726042,19.4088529 Z'
+          id='Eyebrow'
+          transform='translate(27.000414, 12.500000) scale(-1, -1) translate(-27.000414, -12.500000) '
+        />
+        <path
+          d='M73.9726042,19.4088529 C75.452356,11.0203704 88.0622688,5.22829657 97.2106453,8.9774793 C98.2254706,9.39337449 99.4016967,8.94600219 99.8378196,7.97824531 C100.273943,7.01048842 99.8048116,5.88881678 98.7899862,5.47292159 C87.3457328,0.782843812 71.9550264,7.85221132 70.0280273,18.7760684 C69.84479,19.8148122 70.5792704,20.798534 71.6685352,20.9732726 C72.7578,21.1480113 73.7893668,20.4475967 73.9726042,19.4088529 Z'
+          id='Eyebrow'
+          transform='translate(85.000414, 12.500000) scale(1, -1) translate(-85.000414, -12.500000) '
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/SadConcernedNatural.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/SadConcernedNatural.tsx
new file mode 100644
index 000000000..a9e0ede31
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/SadConcernedNatural.tsx
@@ -0,0 +1,22 @@
+import * as React from 'react'
+
+export default class SadConcernedNatural extends React.Component {
+  static optionValue = 'SadConcernedNatural'
+
+  render () {
+    return (
+      <g id='Eyebrow/Natural/Sad-Concerned-Natural' fillOpacity='0.599999964'>
+        <path
+          d='M22.7663531,5.57844898 L23.6772984,5.17582144 C28.9190996,3.09473425 36.8645466,3.96712704 41.7227321,6.29911638 C42.2897848,6.57148957 41.9021563,7.4519421 41.3211012,7.40711006 C26.4021788,6.25602197 16.3582869,15.5525942 12.9460869,21.8470939 C12.8449215,22.0337142 12.5391523,22.05489 12.4635344,21.8808353 C10.156283,16.5620676 16.9134476,7.89614725 22.7663531,5.57844898 Z'
+          id='Eyebrow'
+          transform='translate(27.000000, 13.000000) scale(-1, -1) translate(-27.000000, -13.000000) '
+        />
+        <path
+          d='M80.7663531,5.57844898 L81.6772984,5.17582144 C86.9190996,3.09473425 94.8645466,3.96712704 99.7227321,6.29911638 C100.289785,6.57148957 99.9021563,7.4519421 99.3211012,7.40711006 C84.4021788,6.25602197 74.3582869,15.5525942 70.9460869,21.8470939 C70.8449215,22.0337142 70.5391523,22.05489 70.4635344,21.8808353 C68.156283,16.5620676 74.9134476,7.89614725 80.7663531,5.57844898 Z'
+          id='Eyebrow'
+          transform='translate(85.000000, 13.000000) scale(1, -1) translate(-85.000000, -13.000000) '
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/UnibrowNatural.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/UnibrowNatural.tsx
new file mode 100644
index 000000000..53e315b86
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/UnibrowNatural.tsx
@@ -0,0 +1,22 @@
+import * as React from 'react'
+
+export default class UnibrowNatural extends React.Component {
+  static optionValue = 'UnibrowNatural'
+
+  render () {
+    return (
+      <g id='Eyebrow/Natural/Unibrow-Natural' fillOpacity='0.599999964'>
+        <path
+          d='M57.000525,12 C56.999825,11.9961 56.999825,11.9961 57.000525,12 M59.4596631,14.892451 C61.3120123,16.058698 64.1131185,16.7894891 65.7030886,17.0505179 C71.9486685,18.0766191 78.0153663,15.945512 84.1715051,15.0153209 C89.636055,14.1895424 95.8563653,13.4967455 100.86041,16.507708 C100.987756,16.584232 101.997542,17.2147893 102.524546,17.7511372 C102.91024,18.1443003 103.563259,18.0619945 103.822605,17.5722412 C105.241692,14.8939029 97.7243204,8.76008291 96.2812935,8.14993193 C89.7471082,5.39200867 81.0899445,8.32440654 74.4284137,9.38927986 C70.6888462,9.98718701 66.9279989,10.3803501 63.2409655,11.2908151 C61.9188284,11.6171635 60.6278928,12.2066818 59.3382119,12.3724317 C59.1848981,12.1429782 58.9889964,12 58.7633758,12 C57.5922879,12 55.8451696,15.4574504 58.0750241,15.6547468 C58.7728345,15.7164887 59.215997,15.3816732 59.4596631,14.892451 Z'
+          id='Kahlo'
+          transform='translate(80.500000, 12.500000) rotate(-2.000000) translate(-80.500000, -12.500000) '
+        />
+        <path
+          d='M54.999475,12 C55.000175,11.9961 55.000175,11.9961 54.999475,12 M15.7187065,8.14993193 C22.2528918,5.39200867 30.9100555,8.32440654 37.5715863,9.38927986 C41.3111538,9.98718701 45.0720011,10.3803501 48.7590345,11.2908151 C50.2416282,11.6567696 51.6849876,12.3536477 53.1313394,12.4128263 C53.8325707,12.4413952 54.2674737,13.2763566 53.8149484,13.8242681 C52.3320222,15.6179895 48.3271239,16.7172136 46.2969114,17.0505179 C40.0513315,18.0766191 33.9846337,15.945512 27.8284949,15.0153209 C22.363945,14.1895424 16.1436347,13.4967455 11.1395899,16.507708 C11.0122444,16.584232 10.0024581,17.2147893 9.47545402,17.7511372 C9.0897602,18.1443003 8.43674067,18.0619945 8.17739482,17.5722412 C6.75830756,14.8939029 14.2756796,8.76008291 15.7187065,8.14993193 Z M54.9339874,11 C56.1050753,11 57.8521936,15.4015737 55.6223391,15.6527457 C53.3924847,15.9039176 53.7628995,11 54.9339874,11 Z'
+          id='Frida'
+          transform='translate(32.348682, 12.500000) rotate(2.000000) translate(-32.348682, -12.500000) '
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/UpDown.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/UpDown.tsx
new file mode 100644
index 000000000..ec0c885f2
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/UpDown.tsx
@@ -0,0 +1,24 @@
+import * as React from 'react'
+
+export default class UpDown extends React.Component {
+  static optionValue = 'UpDown'
+
+  render () {
+    return (
+      <g
+        id='Eyebrow/Outline/Up-Down'
+        fillOpacity='0.599999964'
+        fillRule='nonzero'>
+        <path
+          d='M15.5914402,14.1619718 C20.0874642,7.83556966 29.6031809,4.65350252 39.3473715,7.79575991 C40.3986323,8.13476518 41.5256656,7.55736801 41.8646708,6.50610724 C42.2036761,5.45484647 41.6262789,4.32781316 40.5750182,3.98880789 C29.1665516,0.309863172 17.8358054,4.09887835 12.3309495,11.8448183 C11.6910852,12.7451779 11.9022584,13.9937761 12.8026181,14.6336404 C13.7029777,15.2735046 14.9515759,15.0623314 15.5914402,14.1619718 Z'
+          id='Eyebrow'
+        />
+        <path
+          d='M73.6376405,21.1577995 C77.5525501,15.6490895 88.2853148,12.56006 97.5304219,14.8304032 C98.6031199,15.0938282 99.6862617,14.4377829 99.9496867,13.3650849 C100.213112,12.2923868 99.5570664,11.2092451 98.4843684,10.9458201 C87.7477584,8.30920485 75.3194947,11.8862211 70.3771498,18.840646 C69.7372855,19.7410057 69.9484587,20.9896038 70.8488184,21.6294681 C71.749178,22.2693324 72.9977762,22.0581591 73.6376405,21.1577995 Z'
+          id='Eyebrow'
+          transform='translate(85.007549, 16.038421) scale(-1, 1) translate(-85.007549, -16.038421) '
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/UpDownNatural.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/UpDownNatural.tsx
new file mode 100644
index 000000000..556214f20
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/UpDownNatural.tsx
@@ -0,0 +1,21 @@
+import * as React from 'react'
+
+export default class UpDownNatural extends React.Component {
+  static optionValue = 'UpDownNatural'
+
+  render () {
+    return (
+      <g id='Eyebrow/Natural/Up-Down-Natural' fillOpacity='0.599999964'>
+        <path
+          d='M22.7663531,1.57844898 L23.6772984,1.17582144 C28.9190996,-0.905265751 36.8645466,-0.0328729562 41.7227321,2.29911638 C42.2897848,2.57148957 41.9021563,3.4519421 41.3211012,3.40711006 C26.4021788,2.25602197 16.3582869,11.5525942 12.9460869,17.8470939 C12.8449215,18.0337142 12.5391523,18.05489 12.4635344,17.8808353 C10.156283,12.5620676 16.9134476,3.89614725 22.7663531,1.57844898 Z'
+          id='Eye-Browse-Reddit'
+        />
+        <path
+          d='M86.535177,12.0246305 C92.3421916,12.2928751 101.730304,16.5124899 101.488432,22.3684172 C101.480419,22.5600881 101.1989,22.6442368 101.06135,22.496811 C98.306449,19.5374968 78.7459953,16.5471364 71.8564209,18.1317995 C71.2258949,18.2770375 70.7468448,17.6550104 71.1462176,17.2056651 C74.5683263,13.3574126 81.3327077,11.7792465 86.535177,12.0246305 Z'
+          id='Eyebrow'
+          transform='translate(86.246508, 17.285912) rotate(5.000000) translate(-86.246508, -17.285912) '
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/index.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/index.tsx
new file mode 100644
index 000000000..f1556f901
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyebrow/index.tsx
@@ -0,0 +1,36 @@
+import * as React from 'react'
+
+import Angry from './Angry'
+import AngryNatural from './AngryNatural'
+import Default from './Default'
+import DefaultNatural from './DefaultNatural'
+import FlatNatural from './FlatNatural'
+import RaisedExcited from './RaisedExcited'
+import RaisedExcitedNatural from './RaisedExcitedNatural'
+import SadConcerned from './SadConcerned'
+import SadConcernedNatural from './SadConcernedNatural'
+import UnibrowNatural from './UnibrowNatural'
+import UpDown from './UpDown'
+import UpDownNatural from './UpDownNatural'
+import { EyebrowOption, Selector } from '../../../options'
+
+export default class Eyebrow extends React.Component {
+  render () {
+    return (
+      <Selector defaultOption={Default} option={EyebrowOption}>
+        <Angry />
+        <AngryNatural />
+        <Default />
+        <DefaultNatural />
+        <FlatNatural />
+        <RaisedExcited />
+        <RaisedExcitedNatural />
+        <SadConcerned />
+        <SadConcernedNatural />
+        <UnibrowNatural />
+        <UpDown />
+        <UpDownNatural />
+      </Selector>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Close.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Close.tsx
new file mode 100644
index 000000000..dc4e5d0fa
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Close.tsx
@@ -0,0 +1,25 @@
+import * as React from 'react'
+
+export default class Close extends React.Component {
+  static optionValue = 'Close'
+
+  render () {
+    return (
+      <g
+        id='Eyes/Closed-😌'
+        transform='translate(0.000000, 8.000000)'
+        fillOpacity='0.599999964'>
+        <path
+          d='M16.1601674,32.4473116 C18.006676,28.648508 22.1644225,26 26.9975803,26 C31.8136766,26 35.9591217,28.629842 37.8153518,32.4071242 C38.3667605,33.5291977 37.5821037,34.4474817 36.790607,33.7670228 C34.3395063,31.6597833 30.8587163,30.3437884 26.9975803,30.3437884 C23.2572061,30.3437884 19.8737584,31.5787519 17.4375392,33.5716412 C16.5467928,34.3002944 15.6201012,33.5583844 16.1601674,32.4473116 Z'
+          id='Closed-Eye'
+          transform='translate(27.000000, 30.000000) scale(1, -1) translate(-27.000000, -30.000000) '
+        />
+        <path
+          d='M74.1601674,32.4473116 C76.006676,28.648508 80.1644225,26 84.9975803,26 C89.8136766,26 93.9591217,28.629842 95.8153518,32.4071242 C96.3667605,33.5291977 95.5821037,34.4474817 94.790607,33.7670228 C92.3395063,31.6597833 88.8587163,30.3437884 84.9975803,30.3437884 C81.2572061,30.3437884 77.8737584,31.5787519 75.4375392,33.5716412 C74.5467928,34.3002944 73.6201012,33.5583844 74.1601674,32.4473116 Z'
+          id='Closed-Eye'
+          transform='translate(85.000000, 30.000000) scale(1, -1) translate(-85.000000, -30.000000) '
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Cry.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Cry.tsx
new file mode 100644
index 000000000..5d2271d7f
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Cry.tsx
@@ -0,0 +1,36 @@
+import * as React from 'react'
+
+export default class Cry extends React.Component {
+  static optionValue = 'Cry'
+
+  render () {
+    return (
+      <g id='Eyes/Cry-😢' transform='translate(0.000000, 8.000000)'>
+        <circle
+          id='Eye'
+          fillOpacity='0.599999964'
+          fill='#000000'
+          fillRule='evenodd'
+          cx='30'
+          cy='22'
+          r='6'
+        />
+        <path
+          d='M25,27 C25,27 19,34.2706667 19,38.2706667 C19,41.5846667 21.686,44.2706667 25,44.2706667 C28.314,44.2706667 31,41.5846667 31,38.2706667 C31,34.2706667 25,27 25,27 Z'
+          id='Drop'
+          fill='#92D9FF'
+          fillRule='nonzero'
+        />
+        <circle
+          id='Eye'
+          fillOpacity='0.599999964'
+          fill='#000000'
+          fillRule='evenodd'
+          cx='82'
+          cy='22'
+          r='6'
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Default.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Default.tsx
new file mode 100644
index 000000000..f865ad634
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Default.tsx
@@ -0,0 +1,17 @@
+import * as React from 'react'
+
+export default class Default extends React.Component {
+  static optionValue = 'Default'
+
+  render () {
+    return (
+      <g
+        id='Eyes/Default-😀'
+        transform='translate(0.000000, 8.000000)'
+        fillOpacity='0.599999964'>
+        <circle id='Eye' cx='30' cy='22' r='6' />
+        <circle id='Eye' cx='82' cy='22' r='6' />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Dizzy.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Dizzy.tsx
new file mode 100644
index 000000000..7814bb865
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Dizzy.tsx
@@ -0,0 +1,24 @@
+import * as React from 'react'
+
+export default class Dizzy extends React.Component {
+  static optionValue = 'Dizzy'
+
+  render () {
+    return (
+      <g
+        id='Eyes/X-Dizzy-😵'
+        transform='translate(0.000000, 8.000000)'
+        fillOpacity='0.599999964'
+        fillRule='nonzero'>
+        <path
+          d='M29,25.2 L34.5,30.7 C35,31.1 35.7,31.1 36.1,30.7 L37.7,29.1 C38.1,28.6 38.1,27.9 37.7,27.5 L32.2,22 L37.7,16.5 C38.1,16 38.1,15.3 37.7,14.9 L36.1,13.3 C35.6,12.9 34.9,12.9 34.5,13.3 L29,18.8 L23.5,13.3 C23,12.9 22.3,12.9 21.9,13.3 L20.3,14.9 C19.9,15.3 19.9,16 20.3,16.5 L25.8,22 L20.3,27.5 C19.9,28 19.9,28.7 20.3,29.1 L21.9,30.7 C22.4,31.1 23.1,31.1 23.5,30.7 L29,25.2 Z'
+          id='Eye'
+        />
+        <path
+          d='M83,25.2 L88.5,30.7 C89,31.1 89.7,31.1 90.1,30.7 L91.7,29.1 C92.1,28.6 92.1,27.9 91.7,27.5 L86.2,22 L91.7,16.5 C92.1,16 92.1,15.3 91.7,14.9 L90.1,13.3 C89.6,12.9 88.9,12.9 88.5,13.3 L83,18.8 L77.5,13.3 C77,12.9 76.3,12.9 75.9,13.3 L74.3,14.9 C73.9,15.3 73.9,16 74.3,16.5 L79.8,22 L74.3,27.5 C73.9,28 73.9,28.7 74.3,29.1 L75.9,30.7 C76.4,31.1 77.1,31.1 77.5,30.7 L83,25.2 Z'
+          id='Eye'
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/EyeRoll.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/EyeRoll.tsx
new file mode 100644
index 000000000..18aed10fd
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/EyeRoll.tsx
@@ -0,0 +1,30 @@
+import * as React from 'react'
+
+export default class EyeRoll extends React.Component {
+  static optionValue = 'EyeRoll'
+
+  render () {
+    return (
+      <g id='Eyes/Eye-Roll-🙄' transform='translate(0.000000, 8.000000)'>
+        <circle id='Eyeball' fill='#FFFFFF' cx='30' cy='22' r='14' />
+        <circle id='The-white-stuff' fill='#FFFFFF' cx='82' cy='22' r='14' />
+        <circle
+          id='Eye'
+          fillOpacity='0.699999988'
+          fill='#000000'
+          cx='30'
+          cy='14'
+          r='6'
+        />
+        <circle
+          id='Eye'
+          fillOpacity='0.699999988'
+          fill='#000000'
+          cx='82'
+          cy='14'
+          r='6'
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Happy.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Happy.tsx
new file mode 100644
index 000000000..4c9c43108
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Happy.tsx
@@ -0,0 +1,23 @@
+import * as React from 'react'
+
+export default class Happy extends React.Component {
+  static optionValue = 'Happy'
+
+  render () {
+    return (
+      <g
+        id='Eyes/Happy-😁'
+        transform='translate(0.000000, 8.000000)'
+        fillOpacity='0.599999964'>
+        <path
+          d='M16.1601674,22.4473116 C18.006676,18.648508 22.1644225,16 26.9975803,16 C31.8136766,16 35.9591217,18.629842 37.8153518,22.4071242 C38.3667605,23.5291977 37.5821037,24.4474817 36.790607,23.7670228 C34.3395063,21.6597833 30.8587163,20.3437884 26.9975803,20.3437884 C23.2572061,20.3437884 19.8737584,21.5787519 17.4375392,23.5716412 C16.5467928,24.3002944 15.6201012,23.5583844 16.1601674,22.4473116 Z'
+          id='Squint'
+        />
+        <path
+          d='M74.1601674,22.4473116 C76.006676,18.648508 80.1644225,16 84.9975803,16 C89.8136766,16 93.9591217,18.629842 95.8153518,22.4071242 C96.3667605,23.5291977 95.5821037,24.4474817 94.790607,23.7670228 C92.3395063,21.6597833 88.8587163,20.3437884 84.9975803,20.3437884 C81.2572061,20.3437884 77.8737584,21.5787519 75.4375392,23.5716412 C74.5467928,24.3002944 73.6201012,23.5583844 74.1601674,22.4473116 Z'
+          id='Squint'
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Hearts.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Hearts.tsx
new file mode 100644
index 000000000..cd2ad79fb
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Hearts.tsx
@@ -0,0 +1,25 @@
+import * as React from 'react'
+
+export default class Hearts extends React.Component {
+  static optionValue = 'Hearts'
+
+  render () {
+    return (
+      <g
+        id='Eyes/Hearts-😍'
+        transform='translate(0.000000, 8.000000)'
+        fillOpacity='0.8'
+        fillRule='nonzero'
+        fill='#FF5353'>
+        <path
+          d='M35.9583333,10 C33.4074091,10 30.8837273,11.9797894 29.5,13.8206358 C28.1106364,11.9797894 25.5925909,10 23.0416667,10 C17.5523182,10 14,13.3341032 14,17.6412715 C14,23.3708668 18.4118636,26.771228 23.0416667,30.376724 C24.695,31.6133636 27.8223436,34.7777086 28.2083333,35.470905 C28.5943231,36.1641015 30.3143077,36.1885229 30.7916667,35.470905 C31.2690257,34.7532872 34.3021818,31.6133636 35.9583333,30.376724 C40.5853182,26.771228 45,23.3708668 45,17.6412715 C45,13.3341032 41.4476818,10 35.9583333,10 Z'
+          id='Heart'
+        />
+        <path
+          d='M88.9583333,10 C86.4074091,10 83.8837273,11.9797894 82.5,13.8206358 C81.1106364,11.9797894 78.5925909,10 76.0416667,10 C70.5523182,10 67,13.3341032 67,17.6412715 C67,23.3708668 71.4118636,26.771228 76.0416667,30.376724 C77.695,31.6133636 80.8223436,34.7777086 81.2083333,35.470905 C81.5943231,36.1641015 83.3143077,36.1885229 83.7916667,35.470905 C84.2690257,34.7532872 87.3021818,31.6133636 88.9583333,30.376724 C93.5853182,26.771228 98,23.3708668 98,17.6412715 C98,13.3341032 94.4476818,10 88.9583333,10 Z'
+          id='Heart'
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Side.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Side.tsx
new file mode 100644
index 000000000..3f3a37f29
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Side.tsx
@@ -0,0 +1,23 @@
+import * as React from 'react'
+
+export default class Side extends React.Component {
+  static optionValue = 'Side'
+
+  render () {
+    return (
+      <g
+        id='Eyes/Side-😒'
+        transform='translate(0.000000, 8.000000)'
+        fillOpacity='0.599999964'>
+        <path
+          d='M27.2409577,20.3455337 C26.462715,21.3574913 26,22.6247092 26,24 C26,27.3137085 28.6862915,30 32,30 C35.3137085,30 38,27.3137085 38,24 C38,23.7097898 37.9793961,23.4243919 37.9395713,23.1451894 C37.9474218,22.9227843 37.9097825,22.6709538 37.8153518,22.4071242 C37.7703692,22.2814477 37.7221152,22.1572512 37.6706873,22.0345685 C37.3370199,21.0717264 36.7650456,20.2202109 36.0253277,19.550585 C33.898886,17.3173253 30.5064735,16 26.9975803,16 C22.1644225,16 18.006676,18.648508 16.1601674,22.4473116 C15.6201012,23.5583844 16.5467928,24.3002944 17.4375392,23.5716412 C19.8737584,21.5787519 23.2572061,20.3437884 26.9975803,20.3437884 C27.0788767,20.3437884 27.1600045,20.3443718 27.2409577,20.3455337 Z'
+          id='Eye'
+        />
+        <path
+          d='M85.2409577,20.3455337 C84.462715,21.3574913 84,22.6247092 84,24 C84,27.3137085 86.6862915,30 90,30 C93.3137085,30 96,27.3137085 96,24 C96,23.7097898 95.9793961,23.4243919 95.9395713,23.1451894 C95.9474218,22.9227843 95.9097825,22.6709538 95.8153518,22.4071242 C95.7703692,22.2814477 95.7221152,22.1572512 95.6706873,22.0345685 C95.3370199,21.0717264 94.7650456,20.2202109 94.0253277,19.550585 C91.898886,17.3173253 88.5064735,16 84.9975803,16 C80.1644225,16 76.006676,18.648508 74.1601674,22.4473116 C73.6201012,23.5583844 74.5467928,24.3002944 75.4375392,23.5716412 C77.8737584,21.5787519 81.2572061,20.3437884 84.9975803,20.3437884 C85.0788767,20.3437884 85.1600045,20.3443718 85.2409577,20.3455337 Z'
+          id='Eye'
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Squint.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Squint.tsx
new file mode 100644
index 000000000..ac7324fa2
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Squint.tsx
@@ -0,0 +1,57 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+export default class Squint extends React.Component {
+  static optionValue = 'Squint'
+
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+
+  render () {
+    const { path1, path2, mask1, mask2 } = this
+    return (
+      <g id='Eyes/Squint-😊' transform='translate(0.000000, 8.000000)'>
+        <defs>
+          <path
+            d='M14,14.0481187 C23.6099827,14.0481187 28,18.4994466 28,11.5617716 C28,4.62409673 21.7319865,0 14,0 C6.2680135,0 0,4.62409673 0,11.5617716 C0,18.4994466 4.39001726,14.0481187 14,14.0481187 Z'
+            id={path1}
+          />
+          <path
+            d='M14,14.0481187 C23.6099827,14.0481187 28,18.4994466 28,11.5617716 C28,4.62409673 21.7319865,0 14,0 C6.2680135,0 0,4.62409673 0,11.5617716 C0,18.4994466 4.39001726,14.0481187 14,14.0481187 Z'
+            id={path2}
+          />
+        </defs>
+        <g id='Eye' transform='translate(16.000000, 13.000000)'>
+          <mask id={mask1} fill='white'>
+            <use xlinkHref={'#' + path1} />
+          </mask>
+          <use id='The-white-stuff' fill='#FFFFFF' xlinkHref={'#' + path1} />
+          <circle
+            fillOpacity='0.699999988'
+            fill='#000000'
+            mask={`url(#${mask1})`}
+            cx='14'
+            cy='10'
+            r='6'
+          />
+        </g>
+        <g id='Eye' transform='translate(68.000000, 13.000000)'>
+          <mask id={mask2} fill='white'>
+            <use xlinkHref={'#' + path2} />
+          </mask>
+          <use id='Eyeball-Mask' fill='#FFFFFF' xlinkHref={'#' + path2} />
+          <circle
+            fillOpacity='0.699999988'
+            fill='#000000'
+            mask={`url(#${mask2})`}
+            cx='14'
+            cy='10'
+            r='6'
+          />
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Surprised.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Surprised.tsx
new file mode 100644
index 000000000..eb7f7e773
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Surprised.tsx
@@ -0,0 +1,30 @@
+import * as React from 'react'
+
+export default class Surprised extends React.Component {
+  static optionValue = 'Surprised'
+
+  render () {
+    return (
+      <g id='Eyes/Surprised-😳' transform='translate(0.000000, 8.000000)'>
+        <circle id='The-White-Stuff' fill='#FFFFFF' cx='30' cy='22' r='14' />
+        <circle id='Eye-Ball' fill='#FFFFFF' cx='82' cy='22' r='14' />
+        <circle
+          id='Eye'
+          fillOpacity='0.699999988'
+          fill='#000000'
+          cx='30'
+          cy='22'
+          r='6'
+        />
+        <circle
+          id='Eye'
+          fillOpacity='0.699999988'
+          fill='#000000'
+          cx='82'
+          cy='22'
+          r='6'
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Wink.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Wink.tsx
new file mode 100644
index 000000000..e40c507e5
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/Wink.tsx
@@ -0,0 +1,21 @@
+import * as React from 'react'
+
+export default class Wink extends React.Component {
+  static optionValue = 'Wink'
+
+  render () {
+    return (
+      <g
+        id='Eyes/Wink-😉'
+        transform='translate(0.000000, 8.000000)'
+        fillOpacity='0.599999964'>
+        <circle id='Eye' cx='30' cy='22' r='6' />
+        <path
+          d='M70.4123979,24.204889 C72.2589064,20.4060854 76.4166529,17.7575774 81.2498107,17.7575774 C86.065907,17.7575774 90.2113521,20.3874194 92.0675822,24.1647016 C92.618991,25.2867751 91.8343342,26.2050591 91.0428374,25.5246002 C88.5917368,23.4173607 85.1109468,22.1013658 81.2498107,22.1013658 C77.5094365,22.1013658 74.1259889,23.3363293 71.6897696,25.3292186 C70.7990233,26.0578718 69.8723316,25.3159619 70.4123979,24.204889 Z'
+          id='Winky-Wink'
+          transform='translate(81.252230, 21.757577) rotate(-4.000000) translate(-81.252230, -21.757577) '
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/WinkWacky.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/WinkWacky.tsx
new file mode 100644
index 000000000..044887eba
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/WinkWacky.tsx
@@ -0,0 +1,33 @@
+import * as React from 'react'
+
+export default class WinkWacky extends React.Component {
+  static optionValue = 'WinkWacky'
+
+  render () {
+    return (
+      <g id='Eyes/Wink-Wacky-😜' transform='translate(0.000000, 8.000000)'>
+        <circle
+          id='Cornea?-I-don&#39;t-know'
+          fill='#FFFFFF'
+          cx='82'
+          cy='22'
+          r='12'
+        />
+        <circle
+          id='Eye'
+          fillOpacity='0.699999988'
+          fill='#000000'
+          cx='82'
+          cy='22'
+          r='6'
+        />
+        <path
+          d='M16.1601674,25.4473116 C18.006676,21.648508 22.1644225,19 26.9975803,19 C31.8136766,19 35.9591217,21.629842 37.8153518,25.4071242 C38.3667605,26.5291977 37.5821037,27.4474817 36.790607,26.7670228 C34.3395063,24.6597833 30.8587163,23.3437884 26.9975803,23.3437884 C23.2572061,23.3437884 19.8737584,24.5787519 17.4375392,26.5716412 C16.5467928,27.3002944 15.6201012,26.5583844 16.1601674,25.4473116 Z'
+          id='Winky-Doodle'
+          fillOpacity='0.599999964'
+          fill='#000000'
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/index.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/index.tsx
new file mode 100644
index 000000000..9060b1ef6
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/eyes/index.tsx
@@ -0,0 +1,36 @@
+import * as React from 'react'
+
+import Close from './Close'
+import Cry from './Cry'
+import Default from './Default'
+import Dizzy from './Dizzy'
+import EyeRoll from './EyeRoll'
+import Happy from './Happy'
+import Hearts from './Hearts'
+import Side from './Side'
+import Squint from './Squint'
+import Surprised from './Surprised'
+import Wink from './Wink'
+import WinkWacky from './WinkWacky'
+import { EyesOption, Selector } from '../../../options'
+
+export default class Eyes extends React.Component {
+  render () {
+    return (
+      <Selector defaultOption={Default} option={EyesOption}>
+        <Close />
+        <Cry />
+        <Default />
+        <Dizzy />
+        <EyeRoll />
+        <Happy />
+        <Hearts />
+        <Side />
+        <Squint />
+        <Surprised />
+        <Wink />
+        <WinkWacky />
+      </Selector>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/index.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/index.tsx
new file mode 100644
index 000000000..f4f2fb862
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/index.tsx
@@ -0,0 +1,19 @@
+import * as React from 'react'
+
+import Eyebrow from './eyebrow'
+import Eyes from './eyes'
+import Mouth from './mouth'
+import Nose from './nose/Default'
+
+export default class Face extends React.Component {
+  render () {
+    return (
+      <g id='Face' transform='translate(76.000000, 82.000000)' fill='#000000'>
+        <Mouth />
+        <Nose />
+        <Eyes />
+        <Eyebrow />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Concerned.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Concerned.tsx
new file mode 100644
index 000000000..3b2ef43cc
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Concerned.tsx
@@ -0,0 +1,59 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+export default class Concerned extends React.Component {
+  static optionValue = 'Concerned'
+
+  private path1 = uniqueId('react-path-')
+  private mask1 = uniqueId('react-mask-')
+
+  render () {
+    const { path1, mask1 } = this
+    return (
+      <g id='Mouth/Concerned' transform='translate(2.000000, 52.000000)'>
+        <defs>
+          <path
+            d='M35.117844,15.1280772 C36.1757121,24.6198025 44.2259873,32 54,32 C63.8042055,32 71.8740075,24.574136 72.8917593,15.0400546 C72.9736685,14.272746 72.1167429,13 71.042767,13 C56.1487536,13 44.7379213,13 37.0868244,13 C36.0066168,13 35.0120058,14.1784435 35.117844,15.1280772 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use
+            xlinkHref={'#' + path1}
+            transform='translate(54.003637, 22.500000) scale(1, -1) translate(-54.003637, -22.500000) '
+          />
+        </mask>
+        <use
+          id='Mouth'
+          fillOpacity='0.699999988'
+          fill='#000000'
+          fillRule='evenodd'
+          transform='translate(54.003637, 22.500000) scale(1, -1) translate(-54.003637, -22.500000) '
+          xlinkHref={'#' + path1}
+        />
+        <rect
+          id='Teeth'
+          fill='#FFFFFF'
+          fillRule='evenodd'
+          mask={`url(#${mask1})`}
+          x='39'
+          y='2'
+          width='31'
+          height='16'
+          rx='5'
+        />
+        <g
+          id='Tongue'
+          strokeWidth='1'
+          fillRule='evenodd'
+          mask={`url(#${mask1})`}
+          fill='#FF4F6D'>
+          <g transform='translate(38.000000, 24.000000)'>
+            <circle id='friend?' cx='11' cy='11' r='11' />
+            <circle id='How-you-doing' cx='21' cy='11' r='11' />
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Default.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Default.tsx
new file mode 100644
index 000000000..9ea5faddd
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Default.tsx
@@ -0,0 +1,19 @@
+import * as React from 'react'
+
+export default class Default extends React.Component {
+  static optionValue = 'Default'
+
+  render () {
+    return (
+      <g
+        id='Mouth/Default'
+        transform='translate(2.000000, 52.000000)'
+        fillOpacity='0.699999988'>
+        <path
+          d='M40,15 C40,22.7319865 46.2680135,29 54,29 L54,29 C61.7319865,29 68,22.7319865 68,15'
+          id='Mouth'
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Disbelief.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Disbelief.tsx
new file mode 100644
index 000000000..a86f9bc78
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Disbelief.tsx
@@ -0,0 +1,21 @@
+import * as React from 'react'
+
+export default class Disbelief extends React.Component {
+  static optionValue = 'Disbelief'
+
+  render () {
+    return (
+      <g
+        id='Mouth/Disbelief'
+        transform='translate(2.000000, 52.000000)'
+        fillOpacity='0.699999988'
+        fill='#000000'>
+        <path
+          d='M40,15 C40,22.7319865 46.2680135,29 54,29 L54,29 C61.7319865,29 68,22.7319865 68,15'
+          id='Mouth'
+          transform='translate(54.000000, 22.000000) scale(1, -1) translate(-54.000000, -22.000000) '
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Eating.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Eating.tsx
new file mode 100644
index 000000000..3e40368be
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Eating.tsx
@@ -0,0 +1,40 @@
+import * as React from 'react'
+
+export default class Eating extends React.Component {
+  static optionValue = 'Eating'
+
+  render () {
+    return (
+      <g id='Mouth/Eating' transform='translate(2.000000, 52.000000)'>
+        <g
+          id='Om-Nom-Nom'
+          opacity='0.599999964'
+          strokeWidth='1'
+          transform='translate(28.000000, 6.000000)'
+          fillOpacity='0.599999964'
+          fill='#000000'>
+          <path
+            d='M16.1906378,10.106319 C16.0179484,4.99553347 11.7923466,0.797193688 6.29352385,0 C9.66004124,1.95870633 11.9804619,5.49520667 11.9804619,9.67694348 C11.9804619,15.344608 6.50694731,20.2451296 0.176591694,20.2451296 C0.11761218,20.2451296 0.0587475828,20.2447983 0,20.244138 L8.8963743e-11,20.244138 C1.35764479,20.7317259 2.83995964,21 4.39225962,21 C9.71395931,21 14.2131224,17.8469699 15.6863572,13.5136402 C18.1609431,15.6698775 21.8629994,17.0394229 26,17.0394229 C30.1370006,17.0394229 33.8390569,15.6698775 36.3136428,13.5136402 C37.7868776,17.8469699 42.2860407,21 47.6077404,21 C49.1600404,21 50.6423552,20.7317259 52,20.244138 L52,20.244138 C51.9412524,20.2447983 51.8823878,20.2451296 51.8234083,20.2451296 C45.4930527,20.2451296 40.0195381,15.344608 40.0195381,9.67694348 C40.0195381,5.49520667 42.3399588,1.95870633 45.7064761,0 C40.2076534,0.797193688 35.9820516,4.99553347 35.8093622,10.106319 C33.2452605,11.8422828 29.7948543,12.9056086 26,12.9056086 C22.2051457,12.9056086 18.7547395,11.8422828 16.1906378,10.106319 Z'
+            id='Delicious'
+          />
+        </g>
+        <circle
+          id='Redish'
+          fillOpacity='0.2'
+          fill='#FF4646'
+          cx='17'
+          cy='15'
+          r='9'
+        />
+        <circle
+          id='Redish'
+          fillOpacity='0.2'
+          fill='#FF4646'
+          cx='91'
+          cy='15'
+          r='9'
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Grimace.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Grimace.tsx
new file mode 100644
index 000000000..3158dacb0
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Grimace.tsx
@@ -0,0 +1,47 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+export default class Grimace extends React.Component {
+  static optionValue = 'Grimace'
+
+  private path1 = uniqueId('react-path-')
+  private mask1 = uniqueId('react-mask-')
+
+  render () {
+    const { path1, mask1 } = this
+    return (
+      <g id='Mouth/Grimace' transform='translate(2.000000, 52.000000)'>
+        <defs>
+          <rect id={path1} x='24' y='9' width='60' height='22' rx='11' />
+        </defs>
+        <rect
+          id='Mouth'
+          fillOpacity='0.599999964'
+          fill='#000000'
+          fillRule='evenodd'
+          x='22'
+          y='7'
+          width='64'
+          height='26'
+          rx='13'
+        />
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <use
+          id='Mouth'
+          fill='#FFFFFF'
+          fillRule='evenodd'
+          xlinkHref={'#' + path1}
+        />
+        <path
+          d='M71,22 L62,22 L62,34 L58,34 L58,22 L49,22 L49,34 L45,34 L45,22 L36,22 L36,34 L32,34 L32,22 L24,22 L24,18 L32,18 L32,6 L36,6 L36,18 L45,18 L45,6 L49,6 L49,18 L58,18 L58,6 L62,6 L62,18 L71,18 L71,6 L75,6 L75,18 L83.8666667,18 L83.8666667,22 L75,22 L75,34 L71,34 L71,22 Z'
+          id='Grimace-Teeth'
+          fill='#E6E6E6'
+          fillRule='evenodd'
+          mask={`url(#${mask1})`}
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Sad.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Sad.tsx
new file mode 100644
index 000000000..b15c8f025
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Sad.tsx
@@ -0,0 +1,21 @@
+import * as React from 'react'
+
+export default class Sad extends React.Component {
+  static optionValue = 'Sad'
+
+  render () {
+    return (
+      <g
+        id='Mouth/Sad'
+        transform='translate(2.000000, 52.000000)'
+        fillOpacity='0.699999988'
+        fill='#000000'>
+        <path
+          d='M40.0582943,16.6539438 C40.7076459,23.6831146 46.7016363,28.3768187 54,28.3768187 C61.3416045,28.3768187 67.3633339,23.627332 67.9526838,16.5287605 C67.9840218,16.1513016 67.0772329,15.8529531 66.6289111,16.077395 C61.0902255,18.8502083 56.8805885,20.2366149 54,20.2366149 C51.1558456,20.2366149 47.0072148,18.8804569 41.5541074,16.168141 C41.0473376,15.9160792 40.0197139,16.2363147 40.0582943,16.6539438 Z'
+          id='Mouth'
+          transform='translate(54.005357, 22.188409) scale(1, -1) translate(-54.005357, -22.188409) '
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/ScreamOpen.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/ScreamOpen.tsx
new file mode 100644
index 000000000..549d5d1d3
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/ScreamOpen.tsx
@@ -0,0 +1,59 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+export default class ScreamOpen extends React.Component {
+  static optionValue = 'ScreamOpen'
+
+  private path1 = uniqueId('react-path-')
+  private mask1 = uniqueId('react-mask-')
+
+  render () {
+    const { path1, mask1 } = this
+    return (
+      <g id='Mouth/Scream-Open' transform='translate(2.000000, 52.000000)'>
+        <defs>
+          <path
+            d='M34.0082051,15.1361102 C35.1280248,29.123916 38.2345159,40.9925405 53.9961505,40.9999965 C69.757785,41.0074525 72.9169073,29.0566179 73.9942614,15.0063928 C74.0809675,13.8756222 73.1738581,12.9999965 72.0369872,12.9999965 C65.3505138,12.9999965 62.6703194,14.9936002 53.9894323,14.9999965 C45.3085452,15.0063928 40.7567994,12.9999965 36.0924943,12.9999965 C34.9490269,12.9999965 33.8961688,13.7366502 34.0082051,15.1361102 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use
+            xlinkHref={'#' + path1}
+            transform='translate(54.000000, 26.999998) scale(1, -1) translate(-54.000000, -26.999998) '
+          />
+        </mask>
+        <use
+          id='Mouth'
+          fillOpacity='0.699999988'
+          fill='#000000'
+          fillRule='evenodd'
+          transform='translate(54.000000, 26.999998) scale(1, -1) translate(-54.000000, -26.999998) '
+          xlinkHref={'#' + path1}
+        />
+        <rect
+          id='Teeth'
+          fill='#FFFFFF'
+          fillRule='evenodd'
+          mask={`url(#${mask1})`}
+          x='39'
+          y='2'
+          width='31'
+          height='16'
+          rx='5'
+        />
+        <g
+          id='Tongue'
+          strokeWidth='1'
+          fillRule='evenodd'
+          mask={`url(#${mask1})`}
+          fill='#FF4F6D'>
+          <g transform='translate(38.000000, 32.000000)' id='Say-ahhhh'>
+            <circle cx='11' cy='11' r='11' />
+            <circle cx='21' cy='11' r='11' />
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Serious.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Serious.tsx
new file mode 100644
index 000000000..105fe84e0
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Serious.tsx
@@ -0,0 +1,17 @@
+import * as React from 'react'
+
+export default class Serious extends React.Component {
+  static optionValue = 'Serious'
+
+  render () {
+    return (
+      <g
+        id='Mouth/Serious'
+        transform='translate(2.000000, 52.000000)'
+        fill='#000000'
+        fillOpacity='0.699999988'>
+        <rect id='Why-so-serious?' x='42' y='18' width='24' height='6' rx='3' />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Smile.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Smile.tsx
new file mode 100644
index 000000000..6ccc0a4fb
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Smile.tsx
@@ -0,0 +1,55 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+export default class Smile extends React.Component {
+  static optionValue = 'Smile'
+
+  private path1 = uniqueId('react-path-')
+  private mask1 = uniqueId('react-mask-')
+
+  render () {
+    const { path1, mask1 } = this
+    return (
+      <g id='Mouth/Smile' transform='translate(2.000000, 52.000000)'>
+        <defs>
+          <path
+            d='M35.117844,15.1280772 C36.1757121,24.6198025 44.2259873,32 54,32 C63.8042055,32 71.8740075,24.574136 72.8917593,15.0400546 C72.9736685,14.272746 72.1167429,13 71.042767,13 C56.1487536,13 44.7379213,13 37.0868244,13 C36.0066168,13 35.0120058,14.1784435 35.117844,15.1280772 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <use
+          id='Mouth'
+          fillOpacity='0.699999988'
+          fill='#000000'
+          fillRule='evenodd'
+          xlinkHref={'#' + path1}
+        />
+        <rect
+          id='Teeth'
+          fill='#FFFFFF'
+          fillRule='evenodd'
+          mask={`url(#${mask1})`}
+          x='39'
+          y='2'
+          width='31'
+          height='16'
+          rx='5'
+        />
+        <g
+          id='Tongue'
+          strokeWidth='1'
+          fillRule='evenodd'
+          mask={`url(#${mask1})`}
+          fill='#FF4F6D'>
+          <g transform='translate(38.000000, 24.000000)'>
+            <circle cx='11' cy='11' r='11' />
+            <circle cx='21' cy='11' r='11' />
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Tongue.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Tongue.tsx
new file mode 100644
index 000000000..34a8e19cf
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Tongue.tsx
@@ -0,0 +1,50 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+export default class Tongue extends React.Component {
+  static optionValue = 'Tongue'
+
+  private path1 = uniqueId('react-path-')
+  private mask1 = uniqueId('react-mask-')
+
+  render () {
+    const { path1, mask1 } = this
+    return (
+      <g id='Mouth/Tongue' transform='translate(2.000000, 52.000000)'>
+        <defs>
+          <path
+            d='M29,15.6086957 C30.410031,25.2313711 41.062182,33 54,33 C66.9681454,33 77.6461342,25.183301 79,14.7391304 C79.1012093,14.3397326 78.775269,13 76.826087,13 C56.838426,13 41.7395748,13 31.173913,13 C29.3833142,13 28.870211,14.2404669 29,15.6086957 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <use
+          id='Mouth'
+          fillOpacity='0.699999988'
+          fill='#000000'
+          fillRule='evenodd'
+          xlinkHref={'#' + path1}
+        />
+        <rect
+          id='Teeth'
+          fill='#FFFFFF'
+          fillRule='evenodd'
+          mask={`url(#${mask1})`}
+          x='39'
+          y='2'
+          width='31'
+          height='16'
+          rx='5'
+        />
+        <path
+          d='M65.9841079,23.7466656 C65.9945954,23.8296335 66,23.9141856 66,24 L66,33 C66,39.0751322 61.0751322,44 55,44 L54,44 C47.9248678,44 43,39.0751322 43,33 L43,24 L43,24 C43,23.9141856 43.0054046,23.8296335 43.0158921,23.7466656 C43.0053561,23.6651805 43,23.5829271 43,23.5 C43,21.5670034 45.9101491,20 49.5,20 C51.510438,20 53.3076958,20.4914717 54.5,21.2634601 C55.6923042,20.4914717 57.489562,20 59.5,20 C63.0898509,20 66,21.5670034 66,23.5 C66,23.5829271 65.9946439,23.6651805 65.9841079,23.7466656 Z'
+          id='Tongue'
+          fill='#FF4F6D'
+          fillRule='evenodd'
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Twinkle.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Twinkle.tsx
new file mode 100644
index 000000000..29383bb7e
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Twinkle.tsx
@@ -0,0 +1,21 @@
+import * as React from 'react'
+
+export default class Twinkle extends React.Component {
+  static optionValue = 'Twinkle'
+
+  render () {
+    return (
+      <g
+        id='Mouth/Twinkle'
+        transform='translate(2.000000, 52.000000)'
+        fillOpacity='0.599999964'
+        fillRule='nonzero'
+        fill='#000000'>
+        <path
+          d='M40,16 C40,21.371763 46.1581544,25 54,25 C61.8418456,25 68,21.371763 68,16 C68,14.8954305 67.050301,14 66,14 C64.7072748,14 64.1302316,14.9051755 64,16 C62.7575758,18.9378973 59.6832595,20.7163149 54,21 C48.3167405,20.7163149 45.2424242,18.9378973 44,16 C43.8697684,14.9051755 43.2927252,14 42,14 C40.949699,14 40,14.8954305 40,16 Z'
+          id='Mouth'
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Vomit.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Vomit.tsx
new file mode 100644
index 000000000..36e687e52
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/Vomit.tsx
@@ -0,0 +1,90 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+export default class Vomit extends React.Component {
+  static optionValue = 'Vomit'
+
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private mask1 = uniqueId('react-mask-')
+  private filter1 = uniqueId('react-filter-')
+
+  render () {
+    const { path1, path2, filter1, mask1 } = this
+    return (
+      <g id='Mouth/Vomit' transform='translate(2.000000, 52.000000)'>
+        <defs>
+          <path
+            d='M34.0082051,12.6020819 C35.1280248,23.0929366 38.2345159,31.9944054 53.9961505,31.9999974 C69.757785,32.0055894 72.9169073,23.0424631 73.9942614,12.5047938 C74.0809675,11.6567158 73.1738581,10.9999965 72.0369872,10.9999965 C65.3505138,10.9999965 62.6703194,12.4951994 53.9894323,12.4999966 C45.3085452,12.5047938 40.7567994,10.9999965 36.0924943,10.9999965 C34.9490269,10.9999965 33.8961688,11.5524868 34.0082051,12.6020819 Z'
+            id={path1}
+          />
+          <path
+            d='M59.9170416,36 L60,36 C60,39.3137085 62.6862915,42 66,42 C69.3137085,42 72,39.3137085 72,36 L72,35 L72,31 C72,27.6862915 69.3137085,25 66,25 L66,25 L42,25 L42,25 C38.6862915,25 36,27.6862915 36,31 L36,31 L36,35 L36,38 C36,41.3137085 38.6862915,44 42,44 C45.3137085,44 48,41.3137085 48,38 L48,36 L48.0829584,36 C48.5590365,33.1622867 51.0270037,31 54,31 C56.9729963,31 59.4409635,33.1622867 59.9170416,36 Z'
+            id={path2}
+          />
+          <filter
+            x='-1.4%'
+            y='-2.6%'
+            width='102.8%'
+            height='105.3%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='-1'
+              in='SourceAlpha'
+              result='shadowOffsetInner1'
+            />
+            <feComposite
+              in='shadowOffsetInner1'
+              in2='SourceAlpha'
+              operator='arithmetic'
+              k2='-1'
+              k3='1'
+              result='shadowInnerInner1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0'
+              type='matrix'
+              in='shadowInnerInner1'
+            />
+          </filter>
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use
+            xlinkHref={'#' + path1}
+            transform='translate(54.000000, 21.499998) scale(1, -1) translate(-54.000000, -21.499998) '
+          />
+        </mask>
+        <use
+          id='Mouth'
+          fillOpacity='0.699999988'
+          fill='#000000'
+          fillRule='evenodd'
+          transform='translate(54.000000, 21.499998) scale(1, -1) translate(-54.000000, -21.499998) '
+          xlinkHref={'#' + path1}
+        />
+        <rect
+          id='Teeth'
+          fill='#FFFFFF'
+          fillRule='evenodd'
+          mask={`url(#${mask1})`}
+          x='39'
+          y='0'
+          width='31'
+          height='16'
+          rx='5'
+        />
+        <g id='Vomit-Stuff'>
+          <use fill='#88C553' fillRule='evenodd' xlinkHref={'#' + path2} />
+          <use
+            fill='black'
+            fillOpacity='1'
+            filter={`url(#${filter1})`}
+            xlinkHref={'#' + path2}
+          />
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/index.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/index.tsx
new file mode 100644
index 000000000..dd1568cf6
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/mouth/index.tsx
@@ -0,0 +1,36 @@
+import * as React from 'react'
+
+import Concerned from './Concerned'
+import Default from './Default'
+import Disbelief from './Disbelief'
+import Eating from './Eating'
+import Grimace from './Grimace'
+import Sad from './Sad'
+import ScreamOpen from './ScreamOpen'
+import Serious from './Serious'
+import Smile from './Smile'
+import Tongue from './Tongue'
+import Twinkle from './Twinkle'
+import Vomit from './Vomit'
+import { MouthOption, Selector } from '../../../options'
+
+export default class Mouth extends React.Component {
+  render () {
+    return (
+      <Selector defaultOption={Default} option={MouthOption}>
+        <Concerned />
+        <Default />
+        <Disbelief />
+        <Eating />
+        <Grimace />
+        <Sad />
+        <ScreamOpen />
+        <Serious />
+        <Smile />
+        <Tongue />
+        <Twinkle />
+        <Vomit />
+      </Selector>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/nose/Default.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/nose/Default.tsx
new file mode 100644
index 000000000..0cac6b327
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/nose/Default.tsx
@@ -0,0 +1,19 @@
+import * as React from 'react'
+
+export default class Default extends React.Component {
+  static optionValue = 'Default'
+
+  render () {
+    return (
+      <g
+        id='Nose/Default'
+        transform='translate(28.000000, 40.000000)'
+        fillOpacity='0.16'>
+        <path
+          d='M16,8 C16,12.418278 21.372583,16 28,16 L28,16 C34.627417,16 40,12.418278 40,8'
+          id='Nose'
+        />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/nose/index.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/nose/index.tsx
new file mode 100644
index 000000000..5544d4bbd
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/face/nose/index.tsx
@@ -0,0 +1 @@
+export { default } from './Default'
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/index.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/index.tsx
new file mode 100644
index 000000000..cd3fc27bc
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/index.tsx
@@ -0,0 +1,113 @@
+import * as React from 'react'
+
+import Accessories from './top/accessories'
+import Clothe from './clothes'
+import Face from './face'
+import Skin from './Skin'
+import Top from './top'
+
+export enum AvatarStyle {
+  Circle = 'Circle',
+  Transparent = 'Transparent'
+}
+
+export interface Props {
+  avatarStyle: AvatarStyle
+  style?: React.CSSProperties
+}
+
+export default class Avatar extends React.Component<Props> {
+  render () {
+    const { avatarStyle } = this.props
+    const circle = avatarStyle === AvatarStyle.Circle
+    return (
+      <svg
+        style={this.props.style}
+        width='264px'
+        height='280px'
+        viewBox='0 0 264 280'
+        version='1.1'
+        xmlns='http://www.w3.org/2000/svg'
+        xmlnsXlink='http://www.w3.org/1999/xlink'>
+        <desc>Created with getavataaars.com</desc>
+        <defs>
+          <circle id='path-1' cx='120' cy='120' r='120' />
+          <path
+            d='M12,160 C12,226.27417 65.72583,280 132,280 C198.27417,280 252,226.27417 252,160 L264,160 L264,-1.42108547e-14 L-3.19744231e-14,-1.42108547e-14 L-3.19744231e-14,160 L12,160 Z'
+            id='path-3'
+          />
+          <path
+            d='M124,144.610951 L124,163 L128,163 L128,163 C167.764502,163 200,195.235498 200,235 L200,244 L0,244 L0,235 C-4.86974701e-15,195.235498 32.235498,163 72,163 L72,163 L76,163 L76,144.610951 C58.7626345,136.422372 46.3722246,119.687011 44.3051388,99.8812385 C38.4803105,99.0577866 34,94.0521096 34,88 L34,74 C34,68.0540074 38.3245733,63.1180731 44,62.1659169 L44,56 L44,56 C44,25.072054 69.072054,5.68137151e-15 100,0 L100,0 L100,0 C130.927946,-5.68137151e-15 156,25.072054 156,56 L156,62.1659169 C161.675427,63.1180731 166,68.0540074 166,74 L166,88 C166,94.0521096 161.51969,99.0577866 155.694861,99.8812385 C153.627775,119.687011 141.237365,136.422372 124,144.610951 Z'
+            id='path-5'
+          />
+        </defs>
+        <g
+          id='Avataaar'
+          stroke='none'
+          strokeWidth='1'
+          fill='none'
+          fillRule='evenodd'>
+          <g
+            transform='translate(-825.000000, -1100.000000)'
+            id='Avataaar/Circle'>
+            <g transform='translate(825.000000, 1100.000000)'>
+              {circle ? (
+                <g
+                  id='Circle'
+                  strokeWidth='1'
+                  fillRule='evenodd'
+                  transform='translate(12.000000, 40.000000)'>
+                  <mask id='mask-2' fill='white'>
+                    <use xlinkHref='#path-1' />
+                  </mask>
+                  <use
+                    id='Circle-Background'
+                    fill='#E6E6E6'
+                    xlinkHref='#path-1'
+                  />
+                  <g
+                    id='Color/Palette/Blue-01'
+                    mask='url(#mask-2)'
+                    fill='#65C9FF'>
+                    <rect id='🖍Color' x='0' y='0' width='240' height='240' />
+                  </g>
+                </g>
+              ) : null}
+              {circle ? (
+                <mask id='mask-4' fill='white'>
+                  <use xlinkHref='#path-3' />
+                </mask>
+              ) : null}
+              <g id='Mask' />
+              <g
+                id='Avataaar'
+                strokeWidth='1'
+                fillRule='evenodd'
+                mask='url(#mask-4)'>
+                <g id='Body' transform='translate(32.000000, 36.000000)'>
+                  <mask id='mask-6' fill='white'>
+                    <use xlinkHref='#path-5' />
+                  </mask>
+                  <use fill='#D0C6AC' xlinkHref='#path-5' />
+                  <Skin maskID='mask-6' />
+                  <path
+                    d='M156,79 L156,102 C156,132.927946 130.927946,158 100,158 C69.072054,158 44,132.927946 44,102 L44,79 L44,94 C44,124.927946 69.072054,150 100,150 C130.927946,150 156,124.927946 156,94 L156,79 Z'
+                    id='Neck-Shadow'
+                    fillOpacity='0.100000001'
+                    fill='#000000'
+                    mask='url(#mask-6)'
+                  />
+                </g>
+                <Clothe />
+                <Face />
+                <Top>
+                  <Accessories />
+                </Top>
+              </g>
+            </g>
+          </g>
+        </g>
+      </svg>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/piece.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/piece.tsx
new file mode 100644
index 000000000..ac7ab17ee
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/piece.tsx
@@ -0,0 +1,52 @@
+import * as React from 'react'
+
+import Clothe from './clothes'
+import Graphics from './clothes/Graphics'
+import Accessories from './top/accessories'
+import FacialHair from './top/facialHair'
+import Top from './top'
+
+import Eyes from './face/eyes'
+import Eyebrows from './face/eyebrow'
+import Mouth from './face/mouth'
+import Nose from './face/nose'
+import Skin from './Skin'
+
+export enum AvatarStyle {
+  Circle = 'Circle',
+  Transparent = 'Transparent',
+}
+
+export interface Props {
+  pieceSize?: string
+  pieceType?: string
+  avatarStyle: AvatarStyle
+  style?: React.CSSProperties
+}
+
+export default class PieceComponent extends React.Component<Props> {
+  render() {
+    return (
+      <svg
+        style={this.props.style}
+        width={`${this.props.pieceSize}px`}
+        height={`${this.props.pieceSize}px`}
+        viewBox="0 0 264 280"
+        version="1.1"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlnsXlink="http://www.w3.org/1999/xlink">
+        {this.props.pieceType === 'top' && <Top />}
+        {this.props.pieceType === 'clothe' && <Clothe />}
+        {this.props.pieceType === 'graphics' && <Graphics maskID="1234" />}
+        {(this.props.pieceType === 'accessories' ||
+          this.props.pieceType === 'accesories') && <Accessories />}
+        {this.props.pieceType === 'facialHair' && <FacialHair />}
+        {this.props.pieceType === 'eyes' && <Eyes />}
+        {this.props.pieceType === 'eyebrows' && <Eyebrows />}
+        {this.props.pieceType === 'mouth' && <Mouth />}
+        {this.props.pieceType === 'nose' && <Nose />}
+        {this.props.pieceType === 'skin' && <Skin maskID="5678" />}
+      </svg>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/Eyepatch.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/Eyepatch.tsx
new file mode 100644
index 000000000..76af9baf6
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/Eyepatch.tsx
@@ -0,0 +1,37 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+
+export default class Eyepatch extends React.Component {
+  static optionValue = 'Eyepatch'
+
+  private mask1 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, path1 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Accesories/Eyepatch' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <FacialHair />
+            <path
+              d='M160.395307,39.7810237 C157.318088,36.6927979 154.11865,43.6386608 152.623361,45.4281124 C149.013122,49.7486528 145.540256,54.182935 141.868413,58.4518947 C134.616309,66.8823544 127.439316,75.3743141 120.233991,83.8401528 C119.140279,85.1257012 119.27271,85.2649028 117.837048,85.3885641 C116.88598,85.4708947 115.563312,84.9802173 114.5737,84.9256608 C111.823607,84.774556 109.112057,85.2348141 106.435756,85.8227012 C101.091389,86.9961608 95.4264863,88.9291124 90.7890799,91.898306 C89.5718308,92.677306 88.7874545,93.5971608 87.4670933,93.841177 C86.3183659,94.0534512 84.794416,93.6295641 83.622299,93.5194592 C81.5412806,93.3237173 78.5378542,92.4726366 76.4953793,92.9137173 C73.9027538,93.4738302 72.9174244,96.6109915 75.5604528,98.0003624 C77.570314,99.0564431 81.5706,98.4761608 83.8235816,98.6447899 C86.3971,98.8372253 85.6120649,98.704306 85.2473843,101.164306 C84.7239177,104.69758 85.5985582,108.646475 87.0885766,111.878201 C90.5482655,119.383185 100.122861,127.335201 108.8551,126.603153 C116.142123,125.992451 122.526834,119.413274 125.519389,113.099935 C127.050916,109.868871 127.954546,106.192096 128.250376,102.628403 C128.438811,100.36183 128.333722,97.9580399 127.684083,95.7632173 C127.362888,94.6783705 126.853916,93.5554995 126.308378,92.5695157 C125.866281,91.7710076 123.908799,89.9203866 123.788886,89.1165882 C123.556307,87.5602415 127.973324,83.3874995 128.816339,82.3443141 C132.788953,77.4276205 136.780344,72.5320882 140.721662,67.5889431 C144.603353,62.7201931 148.506456,57.8640076 152.489612,53.0785802 C154.294237,50.9098786 163.318023,42.7148382 160.395307,39.7810237'
+              id='Badass-Eyepatch'
+              fill='#28354B'
+              fillRule='evenodd'
+            />
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/HairColor.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/HairColor.tsx
new file mode 100644
index 000000000..47fd06422
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/HairColor.tsx
@@ -0,0 +1,58 @@
+import * as React from 'react'
+
+import { HairColorOption, Selector } from '../../options'
+
+export interface Props {
+  maskID: string
+}
+
+function makeColor (name: string, color: string) {
+  class ColorComponent extends React.Component<Props> {
+    render () {
+      return (
+        <g
+          id='Skin/👶🏽-03-Brown'
+          mask={`url(#${this.props.maskID})`}
+          fill={color}>
+          <g transform='translate(0.000000, 0.000000) ' id='Color'>
+            <rect x='0' y='0' width='264' height='280' />
+          </g>
+        </g>
+      )
+    }
+  }
+  const anyComponent = ColorComponent as any
+  anyComponent.displayName = name
+  anyComponent.optionValue = name
+  return anyComponent
+}
+
+const Auburn = makeColor('Auburn', '#A55728')
+const Black = makeColor('Black', '#2C1B18')
+const Blonde = makeColor('Blonde', '#B58143')
+const BlondeGolden = makeColor('BlondeGolden', '#D6B370')
+const Brown = makeColor('Brown', '#724133')
+const BrownDark = makeColor('BrownDark', '#4A312C')
+const PastelPink = makeColor('PastelPink', '#F59797')
+const Platinum = makeColor('Platinum', '#ECDCBF')
+const Red = makeColor('Red', '#C93305')
+const SilverGray = makeColor('SilverGray', '#E8E1E1')
+
+export default class HairColor extends React.Component<Props> {
+  render () {
+    return (
+      <Selector option={HairColorOption} defaultOption={BrownDark}>
+        <Auburn maskID={this.props.maskID} />
+        <Black maskID={this.props.maskID} />
+        <Blonde maskID={this.props.maskID} />
+        <BlondeGolden maskID={this.props.maskID} />
+        <Brown maskID={this.props.maskID} />
+        <BrownDark maskID={this.props.maskID} />
+        <PastelPink maskID={this.props.maskID} />
+        <Platinum maskID={this.props.maskID} />
+        <Red maskID={this.props.maskID} />
+        <SilverGray maskID={this.props.maskID} />
+      </Selector>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/Hat.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/Hat.tsx
new file mode 100644
index 000000000..1840b331b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/Hat.tsx
@@ -0,0 +1,96 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+
+export default class Hat extends React.Component {
+  static optionValue = 'Hat'
+
+  private filter1 = uniqueId('react-filter-')
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { filter1, mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path2} x='0' y='0' width='264' height='280' />
+          <path
+            d='M156,180.610951 C173.530782,172.282984 186.048193,155.114792 187.791419,134.867187 C193.569129,134.002364 198,129.018625 198,123 L198,110 C198,104.054007 193.675427,99.1180731 188,98.1659169 L188,92 C188,84.0546578 186.345324,76.495786 183.361772,69.6491845 C173.434911,53 89.3126235,53.8033992 80.7098777,69.4854816 C77.6811789,76.3752214 76,83.9912805 76,92 L76,98.1659169 C70.3245733,99.1180731 66,104.054007 66,110 L66,123 C66,129.018625 70.4308707,134.002364 76.2085808,134.867187 C77.9518066,155.114792 90.4692178,172.282984 108,180.610951 L108,199 L104,199 L104,199 C64.235498,199 32,231.235498 32,271 L32,280 L232,280 L232,271 C232,231.235498 199.764502,199 160,199 L156,199 L156,180.610951 Z M0,5.68434189e-14 L264,5.68434189e-14 L264,280 L0,280 L0,5.68434189e-14 Z'
+            id={path1}
+          />
+          <filter
+            x='-0.8%'
+            y='-2.0%'
+            width='101.5%'
+            height='108.0%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path2} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Accesories/Hat' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <g
+              id='Hat'
+              strokeWidth='1'
+              fillRule='evenodd'
+              transform='translate(1.000000, 0.000000)'>
+              <mask id={mask2} fill='white'>
+                <use xlinkHref={'#' + path1} />
+              </mask>
+              <g id='Mask-Hair' />
+              <path
+                d='M123.182388,2 L141.817612,2 L141.817612,2 C160.609055,2 176.866947,15.0804442 180.890118,33.4361631 L190,75 L75,75 L84.1098821,33.4361631 L84.1098821,33.4361631 C88.1330533,15.0804442 104.390945,2 123.182388,2 Z'
+                fill='#1F333C'
+                mask={`url(#${mask2})`}
+              />
+              <ellipse
+                id='Hipster'
+                fill='#1F333C'
+                mask={`url(#${mask2})`}
+                cx='132'
+                cy='87.5'
+                rx='122'
+                ry='57.5'
+              />
+              <ellipse
+                id='Very'
+                fill='#15232A'
+                mask={`url(#${mask2})`}
+                cx='132'
+                cy='82'
+                rx='62'
+                ry='25'
+              />
+            </g>
+            <FacialHair />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/HatColor.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/HatColor.tsx
new file mode 100644
index 000000000..0f62b5e09
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/HatColor.tsx
@@ -0,0 +1,70 @@
+import * as React from 'react'
+
+import { HatColorOption, Selector } from '../../options'
+
+export interface Props {
+  maskID: string
+  defaultColor?: string
+}
+
+function makeColor (name: string, color: string) {
+  class ColorComponent extends React.Component<Props> {
+    render () {
+      return (
+        <g
+          id='Color/Palette/Gray-01'
+          mask={`url(#${this.props.maskID})`}
+          fillRule='evenodd'
+          fill={color}>
+          <rect id='🖍Color' x='0' y='0' width='264' height='280' />
+        </g>
+      )
+    }
+  }
+  const anyComponent = ColorComponent as any
+  anyComponent.displayName = name
+  anyComponent.optionValue = name
+  return anyComponent
+}
+
+const Black = makeColor('Black', '#262E33')
+const Blue01 = makeColor('Blue01', '#65C9FF')
+const Blue02 = makeColor('Blue02', '#5199E4')
+const Blue03 = makeColor('Blue03', '#25557C')
+const Gray01 = makeColor('Gray01', '#E6E6E6')
+const Gray02 = makeColor('Gray02', '#929598')
+const Heather = makeColor('Heather', '#3C4F5C')
+const PastelBlue = makeColor('PastelBlue', '#B1E2FF')
+const PastelGreen = makeColor('PastelGreen', '#A7FFC4')
+const PastelOrange = makeColor('PastelOrange', '#FFDEB5')
+const PastelRed = makeColor('PastelRed', '#FFAFB9')
+const PastelYellow = makeColor('PastelYellow', '#FFFFB1')
+const Pink = makeColor('Pink', '#FF488E')
+const Red = makeColor('Red', '#FF5C5C')
+const White = makeColor('White', '#FFFFFF')
+
+export default class Colors extends React.Component<Props> {
+  render() {
+    return (
+      <Selector
+        option={HatColorOption}
+        defaultOption={this.props.defaultColor || Gray01}>
+        <Black maskID={this.props.maskID} />
+        <Blue01 maskID={this.props.maskID} />
+        <Blue02 maskID={this.props.maskID} />
+        <Blue03 maskID={this.props.maskID} />
+        <Gray01 maskID={this.props.maskID} />
+        <Gray02 maskID={this.props.maskID} />
+        <Heather maskID={this.props.maskID} />
+        <PastelBlue maskID={this.props.maskID} />
+        <PastelGreen maskID={this.props.maskID} />
+        <PastelOrange maskID={this.props.maskID} />
+        <PastelRed maskID={this.props.maskID} />
+        <PastelYellow maskID={this.props.maskID} />
+        <Pink maskID={this.props.maskID} />
+        <Red maskID={this.props.maskID} />
+        <White maskID={this.props.maskID} />
+      </Selector>
+    )
+  }
+}
\ No newline at end of file
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/Hijab.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/Hijab.tsx
new file mode 100644
index 000000000..83fc9b2a5
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/Hijab.tsx
@@ -0,0 +1,92 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import HatColor from './HatColor'
+
+export default class Hijab extends React.Component {
+  static optionValue = 'Hijab'
+
+  private filter1 = uniqueId('react-filter-')
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { filter1, mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M66.0421575,77.0749852 C71.6795257,45.2058307 99.5129755,21 133,21 L133,21 L133,21 C170.555363,21 201,51.444637 201,89 L201,119.751022 C201.875211,129.554379 202.693946,136.422143 203.456205,140.354314 C204.833317,147.458254 209.150269,145.115419 209.150269,155.220201 C209.150269,165.324983 204.822005,168.720206 204.803237,177.705482 C204.784469,186.690758 220.200444,193.836185 220.200444,205.242606 C220.200444,216.649027 213.126079,270.475928 142.577598,270.475928 C127.507235,270.475928 114.670509,266.188589 104.06742,257.613911 C104.750275,264.103957 105.394468,271.565987 106,280 L59,280 C59.9324304,256.228591 51.7156549,242.936205 51.7156549,216.44564 C51.7156549,189.955074 65.3525844,151.427541 65,142 C65.019981,141.417741 65.0406721,140.728417 65.0620734,139.932027 C65.0208303,138.959828 65,137.982347 65,137 L65,89 L65,89 C65,85.0240875 65.3412247,81.1278723 65.9959868,77.3390417 C65.9973236,77.2261704 65.9986613,77.1131564 66,77 C66.0140661,77.0249783 66.0281186,77.0499734 66.0421575,77.0749852 Z M132.5,53 L132.5,53 C102.400481,53 78,77.4004811 78,107.5 L78,107.5 L78,130.5 C78,160.599519 102.400481,185 132.5,185 L133.5,185 C163.599519,185 188,160.599519 188,130.5 L188,107.5 C188,77.4004811 163.599519,53 133.5,53 L133.5,53 L132.5,53 Z'
+            id={path2}
+          />
+          <filter
+            x='-0.8%'
+            y='-2.0%'
+            width='101.5%'
+            height='108.0%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Accesories/Hijab' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <mask id={mask2} fill='white'>
+              <use xlinkHref={'#' + path2} />
+            </mask>
+            <use
+              id='Hijab-Mask'
+              stroke='none'
+              fill='#3B6BAD'
+              fillRule='evenodd'
+              xlinkHref={'#' + path2}
+            />
+            <HatColor maskID={mask2} defaultColor='Blue03' />
+            <path
+              d='M72.0744416,104.959767 C71.3690172,101.246903 71,97.4161983 71,93.5 C71,59.5344879 98.7583455,32 133,32 C167.241654,32 195,59.5344879 195,93.5 C195,97.4161983 194.630983,101.246903 193.925558,104.959767 C192.341315,72.6827942 165.669927,47 133,47 C100.330073,47 73.6586845,72.6827942 72.0744428,104.959774 Z'
+              id='Band'
+              stroke='none'
+              fillOpacity='0.5'
+              fill='#FFFFFF'
+              fillRule='evenodd'
+              mask={`url(#${mask2})`}
+            />
+            <path
+              d='M187.929085,104.69543 C188.631457,108.187732 189,111.800827 189,115.5 L189,138.5 C189,168.599519 164.599519,193 134.5,193 L131.5,193 C101.400481,193 77,168.599519 77,138.5 L77,115.5 L77,115.5 C77,111.800827 77.3685433,108.187732 78.0709154,104.69543 C78.0238287,105.624341 78,106.559388 78,107.5 L78,107.5 L78,130.5 C78,160.599519 102.400481,185 132.5,185 L133.5,185 C163.599519,185 188,160.599519 188,130.5 L188,130.5 L188,107.5 C188,106.559388 187.976171,105.624341 187.929085,104.69543 Z M114.16682,206.995462 C120.651206,211.981028 135.663493,213.708321 152.404574,210.756416 C169.145655,207.804512 182.661822,201.046883 187.049987,194.144193 C187.118291,194.396526 187.175421,194.652296 187.221114,194.911435 C188.930607,204.606451 173.985409,215.345413 153.84008,218.897578 C133.694752,222.449742 115.977919,217.469978 114.268426,207.774963 C114.222732,207.515823 114.188938,207.255938 114.166824,206.995464 Z M126.034638,235.921439 C134.227056,241.574977 150.421729,241.843835 167.103682,235.772101 C183.785635,229.700366 196.018656,219.084674 198.660388,209.487828 C198.803116,209.80837 198.935124,210.134883 199.056117,210.46731 C203.582768,222.904181 190.979008,238.909268 170.904831,246.215671 C150.830654,253.522074 130.887742,249.363007 126.361091,236.926135 C126.240098,236.593709 126.131343,236.258733 126.034643,235.921442 Z'
+              id='Shadows'
+              stroke='none'
+              fillOpacity='0.16'
+              fill='#000000'
+              fillRule='evenodd'
+              opacity='0.899999976'
+              mask={`url(#${mask2})`}
+            />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairBigHair.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairBigHair.tsx
new file mode 100644
index 000000000..f1de12814
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairBigHair.tsx
@@ -0,0 +1,81 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class LongHairBigHair extends React.Component {
+  static optionValue = 'LongHairBigHair'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private mask3 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private path3 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, mask3, path1, path2, path3 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M222.384814,182.806274 C217.011239,188.518122 211.648364,192.127879 211.831204,198 C212.148076,209.888877 255.439069,245.051165 216.999964,267.00001 L16.0053198,267 C-22.4337677,245.051165 20.8572256,209.888877 21.1740982,198 C21.3569373,192.127879 15.9940628,188.518122 10.6204878,182.806274 C5.24691269,177.094426 -0.137362978,169.280486 0.00267373922,155 C0.944497502,125.971596 31.3716806,128.588232 31.2026676,109 C31.3716806,89.9992744 19.8139454,82.1607482 31.2026676,46 C42.8395963,9.53932757 72.9165934,0.768171773 116.002651,0.0159928999 L116.002651,0 C116.16951,0.002426813 116.336177,0.0049705256 116.502651,0.0076322645 C116.669125,0.0049705256 116.835791,0.002426813 117.002651,0 L117.002651,0.0159928999 C160.088708,0.768171773 190.165705,9.53932757 201.802634,46 C213.191356,82.1607482 201.633621,89.9992744 201.802634,109 C201.633621,128.588232 232.060804,125.971596 233.002628,155 C233.142665,169.280486 227.758389,177.094426 222.384814,182.806274 Z M182.884023,95.3249541 C161.364085,83.7373848 142.890027,67.1442914 130.845581,48.302359 C112.763849,73.9237118 76.5299076,78.5347548 51.2240944,94.679971 C51.0770557,95.4306015 51,96.2063021 51,97 L51,110 C51,116.018625 55.4308707,121.002364 61.2085808,121.867187 C62.9518066,142.114792 75.4692178,159.282984 93,167.610951 L93,186 L89,186 L89,186 C49.235498,186 17,218.235498 17,258 L17,267 L217,267 L217,258 C217,218.235498 184.764502,186 145,186 L141,186 L141,167.610951 C158.530782,159.282984 171.048193,142.114792 172.791419,121.867187 C178.569129,121.002364 183,116.018625 183,110 L183,97 C183,96.4315537 182.960475,95.8723389 182.884023,95.3249541 Z'
+            id={path2}
+          />
+          <path
+            d='M222.384814,182.806274 C217.011239,188.518122 211.648364,192.127879 211.831204,198 C212.148076,209.888877 255.439069,245.051165 216.999964,267.00001 L16.0053198,267 C-22.4337677,245.051165 20.8572256,209.888877 21.1740982,198 C21.3569373,192.127879 15.9940628,188.518122 10.6204878,182.806274 C5.24691269,177.094426 -0.137362978,169.280486 0.00267373922,155 C0.944497502,125.971596 31.3716806,128.588232 31.2026676,109 C31.3716806,89.9992744 19.8139454,82.1607482 31.2026676,46 C42.8395963,9.53932757 72.9165934,0.768171773 116.002651,0.0159928999 L116.002651,0 C116.16951,0.002426813 116.336177,0.0049705256 116.502651,0.0076322645 C116.669125,0.0049705256 116.835791,0.002426813 117.002651,0 L117.002651,0.0159928999 C160.088708,0.768171773 190.165705,9.53932757 201.802634,46 C213.191356,82.1607482 201.633621,89.9992744 201.802634,109 C201.633621,128.588232 232.060804,125.971596 233.002628,155 C233.142665,169.280486 227.758389,177.094426 222.384814,182.806274 Z M93,186 L89,186 L89,186 C49.235498,186 17,218.235498 17,258 L17,267 L217,267 L217,258 C217,218.235498 184.764502,186 145,186 L141,186 L141,140 L93,140 L93,186 Z'
+            id={path3}
+          />
+        </defs>
+        <mask id={mask2} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Long-Hair/Big-Hair' mask={`url(#${mask2})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <g
+              id='Hair'
+              strokeWidth='1'
+              fill='none'
+              fillRule='evenodd'
+              transform='translate(16.000000, 13.000000)'>
+              <mask id={mask3} fill='white'>
+                <use xlinkHref={'#' + path2} />
+              </mask>
+              <use fill='#314756' xlinkHref={'#' + path2} />
+              <HairColor maskID={mask3} />
+            </g>
+            <g
+              id='Shadow'
+              strokeWidth='1'
+              fill='none'
+              fillRule='evenodd'
+              transform='translate(16.000000, 13.000000)'>
+              <mask id={mask1} fill='white'>
+                <use xlinkHref={'#' + path3} />
+              </mask>
+              <g id='Shape' />
+              <path
+                d='M30.0988695,115.056827 C27.7250732,118.08281 24.5296181,122.528485 24.3618393,122.19381 C26.2345006,119.810609 27.3747977,117.011661 27.3409475,113.436088 C27.517612,95.334874 15.4366324,87.8674306 27.3409475,53.4185647 C28.0096512,51.5090274 29.1070085,49.7044671 30.585889,48.0048838 C20.2433352,82.4586863 31.3685109,90.3556196 31.2026676,109 C31.2224682,111.294844 30.8223327,113.284923 30.0988695,115.056827 Z M202.419413,48.0048838 C203.898293,49.7044671 204.995651,51.5090274 205.664354,53.4185647 C215.822041,82.8130155 208.516445,92.5627534 206.263744,106.036479 C205.964379,106.841192 206.195125,107.789747 205.880216,108.603009 C175.207016,98.1454461 147.589972,78.5596292 131.494917,55.6119279 C108.710969,85.0357527 58.3544031,85.3732378 33.6737341,110.936101 C34.0607045,110.391798 34.4280855,109.884956 34.7584999,109.446288 C57.2940449,79.527377 108.24688,80.3241416 130.845581,48.302359 C146.243536,72.3904102 172.664446,92.9495135 202.009146,103.926748 C202.310417,103.073073 202.089664,102.077381 202.376063,101.232679 C204.483829,87.4002546 211.215481,77.3069293 202.419413,48.0048838 Z'
+                id='Shadow-Mask'
+                fillOpacity='0.16'
+                fill='#000000'
+                mask={`url(#${mask1})`}
+              />
+            </g>
+            <path
+              d='M50.7584999,122.446288 C73.2940449,92.527377 124.24688,93.3241416 146.845581,61.302359 C162.243536,85.3904102 188.664446,105.949514 218.009146,116.926748 C218.310417,116.073073 218.089664,115.077381 218.376063,114.232679 C220.531197,100.089398 227.520377,89.8551619 217.802634,59 C206.165705,22.5393276 176.088708,13.7681718 133.002651,13.0159929 C132.336177,13.0049705 132.16951,13.0024268 132.002651,13 C88.9165934,13.7681718 58.8395963,22.5393276 47.2026676,59 C35.8139454,95.1607482 47.3716806,102.999274 47.2026676,122 C47.2350518,125.753256 46.1441426,128.691293 44.3525888,131.192923 C44.5361111,131.59459 48.5061717,125.436551 50.7584999,122.446288 Z'
+              id='Light'
+              fillOpacity='0.1'
+              fill='#FFFFFF'
+              fillRule='evenodd'
+            />
+            <FacialHair />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairBob.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairBob.tsx
new file mode 100644
index 000000000..54395bbe0
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairBob.tsx
@@ -0,0 +1,49 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class LongHairBob extends React.Component {
+  static optionValue = 'LongHairBob'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M38,79.3595521 L38,111 C38,133.339168 51.0804213,152.623239 70,161.610951 L70,174.74565 C50.3625813,177.434228 34.6409914,182.163507 23.3845374,181.000327 C9.16164761,179.530612 1.49623627,150.795665 1,126 C0.382878875,95.1640258 29.3189583,30.7950013 40,18 C47.9231015,8.50878211 69.6952966,0.550643437 94.0001685,1 C118.30504,1.44935656 140.861928,6.81215989 149.000169,17 C161.324059,32.4276364 186.868727,91.0786423 187.000169,126 C187.093514,150.800049 177.46255,175.65995 164.000169,177 C152.920532,178.102871 137.475571,175.511343 118,173.997342 L118,161.610951 C136.919579,152.623239 150,133.339168 150,111 L150,82.9882378 C140.478735,78.1305678 131.863294,72.248172 124.153679,65.3410505 C127.362309,70.6368571 130.848786,75.1475352 134.61311,78.8730846 C107.596314,71.2928169 86.1055278,58.4501118 70.1407506,40.3449693 C62.1597317,56.8095313 51.4461487,69.8143919 38.0000014,79.3595511 Z'
+            id={path2}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Long-Hair/Bob' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <g
+              id='Hair'
+              strokeWidth='1'
+              fillRule='evenodd'
+              transform='translate(39.000000, 19.000000)'>
+              <mask id={mask2} fill='white'>
+                <use xlinkHref={'#' + path2} />
+              </mask>
+              <use id='Combined-Shape' fill='#E6E6E6' xlinkHref={'#' + path2} />
+              <HairColor maskID={mask2} />
+            </g>
+            <FacialHair />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairBun.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairBun.tsx
new file mode 100644
index 000000000..41c2e6dba
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairBun.tsx
@@ -0,0 +1,50 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class LongHairBun extends React.Component {
+  static optionValue = 'LongHairBun'
+
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path2} x='0' y='0' width='264' height='280' />
+          <path
+            d='M114.939716,28.3372418 C113.953527,28.5587334 112.985531,28.7906134 112.036894,29.0299707 C96.9448338,32.8379559 88.0168242,43.6513048 80.3566792,59.6480618 C76.5956048,67.5028569 74.3660182,76.7914798 74.0230569,85.4813651 C73.8884429,88.8932666 74.3484305,92.415154 75.267729,95.7003546 C75.6049405,96.9061873 77.4232441,101.086987 77.9224658,97.70885 C78.0885348,96.584253 77.4804043,95.0327505 77.4215529,93.8376154 C77.3444374,92.2693977 77.4273028,90.6807875 77.5341822,89.1149098 C77.7340739,86.1874141 78.2559568,83.3154127 79.1847257,80.524647 C80.5119249,76.5367405 82.2013644,72.212859 84.7874413,68.8480942 C91.1883705,60.5205939 95.7648164,43.2055199 133,41.6707324 C170.235184,40.1359449 181.748751,67.461069 185.182761,73.3006826 C189.2479,80.2147477 187.37751,88.7073939 188.619138,96.2008069 C189.091302,99.05041 190.164155,98.986558 190.751315,96.4378281 C191.748406,92.1082634 192.219217,87.6102098 191.901961,83.1592929 C191.183568,73.1114668 187.496636,46.7057251 167.308863,35.006118 C161.866498,31.8520537 156.438352,29.6874962 151.116597,28.2827668 C154.176091,25.3110645 156,21.5675963 156,17.5 C156,7.83501688 145.702549,0 133,0 C120.297451,0 110,7.83501688 110,17.5 C110,21.5924906 111.846303,25.3568736 114.939716,28.3372418 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask2} fill='white'>
+          <use xlinkHref={'#' + path2} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Long-Hair/Bun' mask={`url(#${mask2})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <FacialHair />
+            <mask id={mask1} fill='white'>
+              <use xlinkHref={'#' + path1} />
+            </mask>
+            <use
+              id='Short-Hair'
+              stroke='none'
+              fill='#28354B'
+              fillRule='evenodd'
+              xlinkHref={'#' + path1}
+            />
+            <HairColor maskID={mask1} />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairCurly.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairCurly.tsx
new file mode 100644
index 000000000..de62d0c01
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairCurly.tsx
@@ -0,0 +1,57 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class LongHairCurly extends React.Component {
+  static optionValue = 'LongHairCurly'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M48.7246602,89.2187346 C44.7420117,91.1711421 42,95.2653555 42,100 L42,113 C42,119.018625 46.4308707,124.002364 52.2085808,124.867187 C53.9518066,145.114792 66.4692178,162.282984 84,170.610951 L84,189 L80,189 L80,189 C78.4137385,189 76.8394581,189.051297 75.2787271,189.152323 C70.3620966,186.639548 65.7724391,183.578174 61.590479,180.048925 C57.2814481,181.318646 52.7202934,182 48,182 C21.490332,182 0,160.509668 0,134 C0,119.590902 6.34904132,106.664702 16.4021743,97.866349 C11.1175746,90.6060809 8,81.6671147 8,72 C8,50.160623 23.9112243,32.0375116 44.7738169,28.5905219 C51.0188047,11.8901624 67.1208542,0 86,0 C94.0143172,0 101.528186,2.14267429 108,5.88641659 C114.471814,2.14267429 121.985683,0 130,0 C148.879146,0 164.981195,11.8901624 171.226183,28.5905219 C192.088776,32.0375116 208,50.160623 208,72 C208,81.6671147 204.882425,90.6060809 199.597826,97.866349 C209.650959,106.664702 216,119.590902 216,134 C216,160.509668 194.509668,182 168,182 C163.279707,182 158.718552,181.318646 154.409521,180.048925 C150.227561,183.578174 145.637903,186.639548 140.721273,189.152323 C139.160542,189.051297 137.586262,189 136,189 L136,189 L132,189 L132,170.610951 C149.530782,162.282984 162.048193,145.114792 163.791419,124.867187 C169.569129,124.002364 174,119.018625 174,113 L174,100 C174,95.778427 171.820067,92.0660046 168.524466,89.9269981 C167.450514,89.5343912 166.370126,89.0424011 165.289302,88.4564081 C164.868503,88.3367332 164.43828,88.2394463 164,88.1659169 L164,87.7130302 C155.319369,82.4100235 146.764694,71.1747746 141.449951,56.7992877 C131.312295,58.8351061 119.547256,60 107,60 C95.038684,60 83.7882341,58.9413637 73.9808476,57.0787685 C68.7546917,71.0641476 60.4637821,82.0431875 52,87.4230168 L52,88.1659169 C50.9777341,88.3374206 49.9992949,88.6381729 49.0820602,89.050796 C48.9628927,89.1079465 48.8437566,89.1639284 48.7246602,89.2187346 Z'
+            id={path2}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Long-Hair/Curly' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <path
+              d='M105.984735,27.7643628 C114.013215,26.6267967 122.796163,26 132,26 C142.358003,26 152.182939,26.7938545 160.999342,28.2161842 C183.451688,38.7497687 199,61.559133 199,88 L199,105.044138 C187.461887,104.672508 173.831239,90.7644306 166.449951,70.7992877 C156.312295,72.8351061 144.547256,74 132,74 C120.038684,74 108.788234,72.9413637 98.9808476,71.0787685 C91.6758772,90.6271291 78.3831001,104.301811 67,105.021902 L67,88 L67,88 C67,61.1745453 83.0039076,38.0870034 105.984735,27.7643628 Z'
+              id='Shadow'
+              fillOpacity='0.16'
+              fill='#000000'
+              fillRule='evenodd'
+            />
+            <g
+              id='Hair'
+              strokeWidth='1'
+              fill='none'
+              fillRule='evenodd'
+              transform='translate(25.000000, 10.000000)'>
+              <mask id={mask2} fill='white'>
+                <use xlinkHref={'#' + path2} />
+              </mask>
+              <use id='Curly!' fill='#314756' xlinkHref={'#' + path2} />
+              <HairColor maskID={mask2} />
+            </g>
+            <FacialHair />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairCurvy.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairCurvy.tsx
new file mode 100644
index 000000000..f27e71ab7
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairCurvy.tsx
@@ -0,0 +1,71 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class LongHairCurvy extends React.Component {
+  static optionValue = 'LongHairCurvy'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M162.831093,71.6181521 C162.943003,73.0640672 163,74.5253775 163,76 L163,114 C163,136.339168 149.919579,155.623239 131,164.610951 L131,183 L135,183 C136.524404,183 137.037743,183.047374 138.538625,183.140731 C123.625568,210.496321 119.823733,233.574048 137.47212,247.543277 C139.169858,248.745686 140.396085,249.328761 140.607243,249.428275 C142.980035,250.546232 145.444343,251.76781 148.074296,252.382591 C152.696796,253.463231 158.007057,252.010459 162.630756,251.429524 C164.742591,251.164137 166.847633,251.000636 168.977452,250.993519 C171.542066,250.985014 174.188404,251.078221 176.119408,252.691023 C178.003455,254.264772 177.763079,259.889444 172.244213,262.523872 C176.3432,264.37915 181.25603,260.071171 182.931671,257.34666 C184.398107,254.962171 185.526058,252.378599 186.146081,249.741914 C186.917963,246.458686 186.967717,243.016815 186.363678,239.728032 C185.106048,232.88022 182.187563,226.295538 180.201011,219.605673 C179.468692,217.139607 178.51478,214.440611 178.099366,211.916746 C177.986471,211.23167 177.851996,208.701383 177.957698,208.171998 C178.036425,207.778517 178.016643,207.37549 179.372782,206.996069 C183.288539,205.899634 187.379733,204.063449 190.225486,201.476579 C193.590156,198.418295 195.343925,194.445304 196.758409,190.497133 C198.998525,184.244662 200.281132,177.550111 200.870584,171.057073 C200.99307,169.708269 201.062205,168.361722 201.086383,167.009968 C201.10077,166.193153 201.000862,165.263344 201.094375,164.445141 C201.247433,163.105189 201.039826,163.457881 202.341615,162.571291 C206.599454,159.671476 209.921164,155.448546 212.051783,151.200622 C215.39827,144.528634 215.834064,137.49302 213.117591,130.733555 C210.864687,125.12728 207.291411,119.498616 201.725588,115.887863 C199.588776,114.501568 197.334273,113.244582 195.115337,111.95809 C193.906862,111.257566 191.067703,110.342511 190.209501,109.441341 C189.609259,108.810939 190.56477,105.649382 190.685858,104.583322 C191.213967,99.9353218 190.606132,95.4261763 189.520542,90.8868298 C187.127368,80.8793698 177.487944,64.7382958 173.617944,55.2249863 C170.293437,47.0528435 165.481911,-0.0750473139 108.58669,0.198941193 C51.691468,0.4729297 41.4185991,50.4377258 33.7159879,59.7736698 C25.3512665,69.9121239 16.9074766,89.1763214 22.602684,107.035643 C17.099033,113.95809 4.54481227,124.04369 1.3853513,134.125611 C-0.596804833,140.450807 -0.511883829,147.495621 2.0289526,153.633016 C3.46621561,157.104393 5.52490056,160.250502 7.94045353,163.272162 C10.0566849,165.919435 12.4084972,168.423513 14.4577909,171.110359 C15.6946403,172.732013 16.0263318,173.129312 15.5599656,175.128304 C14.6406208,179.068318 12.7411877,182.853334 11.0939201,186.603116 C8.54189405,192.412639 6.39748885,197.82226 6.0799842,204.016065 C5.77766543,209.912373 7.40435223,226.688671 24.3409972,236.576369 C26.3249517,237.73442 28.2831301,238.743202 30.3833764,239.685161 C29.2931905,236.290327 30.5294405,224.161856 32.7263968,219.653578 C33.2860762,221.204589 34.2369916,222.697108 35.2618383,224.05216 C36.8611506,226.167444 40.636039,231.460774 45.4085994,231.706547 C43.4722007,228.722725 41.3891385,226.708805 40.7853002,223.10864 C44.7616013,225.068753 50.4191385,226.855644 55.0466338,226.691448 C58.4512667,226.570818 63.4709972,224.871405 66.0000446,222.74779 C57.6284322,224.074724 49.679027,221.3155 46.4820009,215.419366 C45.8146217,214.188415 45.3084926,212.898625 45.0141664,211.558847 C44.5967546,209.659309 43.9381673,206.615432 44.8227444,204.862039 C45.0375932,204.436124 45.3893685,204.001198 45.806628,203.572743 C45.7407358,203.49425 45.6753213,203.415537 45.6103845,203.336606 C51.303506,198.550494 58.4494475,190.932516 62.2752482,185.367908 C62.3459243,185.245492 62.416066,185.122857 62.4856702,185 L62.5253504,185 C62.5536953,184.957813 62.5818364,184.915755 62.6097716,184.873828 C67.874859,183.648086 73.3617452,183 79,183 L83,183 L83,164.610951 C64.0804213,155.623239 51,136.339168 51,114 L51,76 L51,76 C51,73.537425 51.1589523,71.1119753 51.4671565,68.733351 C55.4088487,67.4702772 59.365485,66.2776957 63.3986046,65.2045441 C67.8552588,64.0189378 77.7980098,62.0907786 81.6887904,61.1941723 L84.4252449,58.215348 L85.4876566,60.1702128 C87.6456492,60.0042337 99.5663601,58.212708 99.5663601,58.212708 L100.896323,54.9898699 C102.612526,56.7530625 103.834989,57.668872 103.834989,57.668872 C106.391211,57.460454 117.488488,57.2113208 120.119841,57.2427023 C120.119841,57.2427023 127.460212,57.5012269 129.240756,57.5714137 L130.907605,56.9328981 L131.456495,58.0098503 C132.910143,58.601117 141.699367,61.6008734 143.434153,62.138079 L145.980784,61.2323702 C147.100342,63.9256202 149.920119,63.586016 152.257345,65.7132858 C154.760315,67.9915694 159.482831,69.7372554 162.831093,71.6181521 Z'
+            id={path2}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Long-Hair/Curvy' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <path
+              d='M100.899906,42.4648024 C91.1016204,48.4721303 82.3855283,56.3273858 76.5871222,65.36024 C73.8252914,69.662826 71.5532049,74.1995784 69.4361743,78.7575668 C68.3739624,81.0447336 67.4048638,83.3600237 66.475928,85.6893613 C65.8894735,87.1594817 64.9889112,88.7449062 65.8359233,90.2878445 C66.3526427,89.9857996 66.5492598,90.0943892 66.224362,90.6353417 C68.9162579,91.3693254 72.6583769,89.3003017 74.9906073,88.5362205 C79.7539763,86.9753339 84.5203425,85.5025753 89.3986046,84.2045441 C93.8552588,83.0189378 103.79801,81.0907786 107.68879,80.1941723 L110.425245,77.215348 L111.487657,79.1702128 C113.645649,79.0042337 125.56636,77.212708 125.56636,77.212708 L126.896323,73.9898699 C128.612526,75.7530625 129.834989,76.668872 129.834989,76.668872 C132.391211,76.460454 143.488488,76.2113208 146.119841,76.2427023 C146.119841,76.2427023 153.460212,76.5012269 155.240756,76.5714137 L156.907605,75.9328981 L157.456495,77.0098503 C158.910143,77.601117 167.699367,80.6008734 169.434153,81.138079 L171.980784,80.2323702 C173.100342,82.9256202 175.920119,82.586016 178.257345,84.7132858 C181.34867,87.5271086 187.825645,89.5285179 190.917768,91.9756241 C192.024938,92.8519441 193.059576,93.7675012 194.100208,94.7015404 C195.255933,95.7385867 195.085291,95.890424 195.460742,97.0802141 C195.573237,97.4361731 196.715775,99.2788807 197.202722,99.4296139 C198.935909,99.9660566 187.048767,68.9435732 183.785603,64.9771662 C180.417736,60.8830307 158.574915,33.3231248 129.612057,34.2254634'
+              id='Top-Shadow'
+              fillOpacity='0.16'
+              fill='#000000'
+              fillRule='evenodd'
+            />
+            <g
+              id='Hair'
+              strokeWidth='1'
+              fill='none'
+              fillRule='evenodd'
+              transform='translate(26.000000, 16.000000)'>
+              <mask id={mask2} fill='white'>
+                <use xlinkHref={'#' + path2} />
+              </mask>
+              <use id='Hair-Mask' fill='#361A0A' xlinkHref={'#' + path2} />
+              <HairColor maskID={mask2} />
+              <path
+                d='M62.6794556,184.462132 C69.755442,174.755405 62.148959,147.786913 56.1278159,137.800593 C72.9649824,130.137708 106.213574,131.553467 155.87359,142.047871 C151.079203,150.900348 149.123448,158.803527 150.006324,165.757409 C145.469118,171.332534 141.720304,177.127222 138.759883,183.141474 L103.888915,191.746789 C81.8528509,194.400378 68.1163643,191.97216 62.6794556,184.462132 Z'
+                id='Shadow'
+                fillOpacity='0.24'
+                fill='#000000'
+                mask={`url(#${mask2})`}
+              />
+            </g>
+            <path
+              d='M79.0404573,170.094305 C78.9812573,169.892618 78.8354573,169.667152 78.6348573,169.428842 C78.7708573,169.650142 78.9074573,169.871269 79.0404573,170.094305 Z M56.409572,120.375261 C57.2661752,126.5406 58.7356083,132.465374 60.8662263,138.377476 C62.9277086,144.09848 65.285915,149.836145 68.678559,155.067858 C71.8402179,159.943234 75.6031176,164.4923 78.6348973,169.428772 C77.8378388,168.48126 76.1633964,167.329804 75.5207941,166.65115 C74.4643769,165.535276 73.4750971,164.385382 72.5369698,163.193485 C70.6143583,160.749982 68.9003527,158.193833 67.243494,155.609567 C63.9913192,150.536843 61.5529875,145.034363 59.4397533,139.530668 C55.2902133,128.722708 51.1268862,115.61687 54.7738936,104.200899 C54.4921557,104.935095 55.2326668,106.688314 55.3491585,107.497319 C55.5525692,108.91069 55.7349995,110.333608 55.8267142,111.757219 C56.0123415,114.639678 56.0109428,117.505994 56.409572,120.375261 Z M68.8553146,165.041212 C67.4967783,163.309515 64.9739252,161.944396 63.4129772,160.279177 C61.9976938,158.769648 60.9019131,157.07822 59.9070386,155.339754 C57.6517365,151.39922 56.1697151,147.374505 55.6897616,142.969154 C55.7992598,143.49177 56.6083072,144.395543 56.8630702,144.824778 C57.4766993,145.858902 58.0839345,146.89424 58.6508072,147.948671 C59.7481863,149.989667 60.6639345,152.099744 61.7731027,154.135533 C63.8106073,157.875421 66.402796,161.495374 68.8553146,165.041212 Z M73.5320242,183.498629 C74.6465874,185.460651 75.5723262,187.464851 76.1569823,189.60079 C76.4654954,190.727599 76.7138643,191.869508 76.9272658,193.013501 C76.9962017,193.382508 77.0093894,194.709963 77.1846264,195.283955 C74.9700864,190.992812 73.2798587,186.448779 70.6421125,182.34214 C68.0381348,178.288092 64.6948448,174.560527 61.1958996,171.061031 C57.5013364,167.36575 53.7855929,163.879099 51.8038364,159.214262 C50.0788411,155.153619 49.4126608,150.996124 49.8138875,146.658464 C49.8160855,148.56911 51.5706533,151.280256 52.1766896,153.126681 C53.0063178,155.654018 53.6655046,158.231689 54.9143429,160.634229 C57.039566,164.722991 60.873,167.876911 64.0792175,171.321558 C67.631513,175.137643 71.0245567,179.084252 73.5320242,183.498629 Z M59.2286696,174.179456 C60.2874847,175.196917 61.2164205,176.28259 62.0352588,177.454354 C62.9328239,178.738937 63.5914112,180.09017 64.1800637,181.504062 C64.6869921,182.721301 64.9105841,184.986375 65.7074428,186.0021 C63.1288415,182.856337 60.4739112,179.884838 58.6955655,176.312444 C58.0893295,175.089825 57.1480051,173.289222 56.4530516,171.817184 C56.6844363,172.409922 58.7059559,173.677148 59.2286696,174.179456 Z M48.9033745,180.528033 C51.7405353,184.777866 55.450684,188.609052 57.877027,193.056233 C60.7067946,198.242644 61.9518364,203.862978 62.202803,209.595957 C62.3216924,212.307277 62.3152983,215.0606 61.9498383,217.764455 C61.7540204,219.211673 61.4399126,220.650211 61.0810465,222.075732 C60.944973,222.616747 60.2406283,224.002173 60.1037556,224.846586 C59.8140251,214.305575 61.5584024,203.763696 56.0767017,193.942823 C53.4811162,189.292219 49.4912277,185.327212 46.398105,180.924811 C43.6164926,176.966226 40.8998197,173.083838 38.6846803,168.851361 C40.0408188,170.567263 42.485145,171.915893 44.0009349,173.619818 C45.8995688,175.753674 47.3488206,178.199606 48.9033745,180.528033 Z M60.1036574,224.846603 C60.0710574,225.050581 60.0700574,225.224111 60.1172574,225.346603 C60.1116574,225.180112 60.1082574,225.01327 60.1036574,224.846603 Z M50.5604331,202.493815 C50.5610325,202.989874 51.376474,204.011501 51.5992667,204.528562 C52.1207816,205.73799 52.5455864,207.007473 52.7573894,208.289626 C53.1752007,210.818004 52.6269108,213.429521 51.6899823,215.850286 C49.7909489,220.757251 46.8161162,225.102895 43.0767946,229.15 C44.4121524,227.402335 44.9438578,224.56136 45.8833838,222.612182 C46.8478866,220.611106 47.8829238,218.6411 48.7335325,216.600624 C50.652947,211.995842 50.4835046,207.289696 50.5604331,202.493815 Z M41.9174331,221.200893 C42.3180604,220.652936 42.1102537,218.018161 42.3222565,217.328919 C42.714092,216.055618 43.3920613,214.827097 44.170737,213.693866 C43.7551236,214.392828 44.3691524,216.160106 44.1663411,217.067177 C43.8338504,218.55553 42.9962296,219.998582 41.9174331,221.200893 Z M99.6077106,42.748374 C99.5269106,42.804974 99.4471106,42.908174 99.3681106,43.044574 C99.4481106,42.945974 99.5267106,42.846574 99.6077106,42.748374 Z M84.8469387,64.3317143 C86.2672175,63.085837 87.0237138,60.1410677 88.0032026,58.5522183 C89.1283559,56.7269681 90.4213532,54.9730547 91.6476125,53.1960567 C94.0795502,49.6719145 96.3744154,46.2123399 99.3680307,43.0054816 C98.7464089,43.9398028 98.1949219,46.7736616 97.8536394,47.5189663 C96.9620688,49.4667561 95.8988578,51.3334892 94.6328355,53.1235049 C91.7722965,57.1680066 88.7029517,60.9266404 84.8469387,64.3317143 Z M84.3117165,54.1218036 C85.0620186,52.7952168 86.2055548,51.6739619 87.4917584,50.7082248 C86.9188913,51.2107066 86.6607314,53.2831189 86.2670976,53.9831221 C85.472237,55.3952784 84.3143141,56.6130375 83.0714703,57.7545999 C83.7352528,57.1726235 83.842553,54.9516363 84.3117165,54.1218036 Z M203.505599,152.127968 C203.498805,152.179518 203.485417,152.282271 203.464637,152.438483 C203.462638,150.913159 202.784469,149.237352 202.704144,147.668984 C202.592048,145.478545 202.906556,143.353715 203.787137,141.277137 C205.526519,137.175704 208.790083,134.069516 212.950612,131.638511 C211.805877,132.313173 210.683921,134.851617 209.949604,135.906916 C208.84663,137.493162 207.668126,139.094161 206.735993,140.757819 C204.793001,144.225725 204.229725,148.375062 203.505599,152.127968 Z M201.998401,130.481881 C201.761221,131.706583 201.448912,132.921738 201.009121,134.107908 C200.534762,135.386937 199.915938,136.630558 199.22578,137.835993 C198.79578,138.586852 197.246621,140.162684 197.24762,140.993211 C197.165296,136.095098 198.975812,131.657983 202.419809,127.7355 C202.04236,128.392806 202.137271,129.766083 201.998401,130.481881 Z M201.196906,165.719988 C204.852905,165.202752 208.302496,166.981313 210.618342,169.271033 C211.855791,170.494694 212.955568,171.900428 213.683091,173.404055 C214.229783,174.534509 214.228783,176.387356 214.9631,177.323587 C213.165772,174.905078 210.886892,172.951214 208.638584,170.859535 C207.075238,169.404855 203.950944,165.678852 201.196906,165.719988 Z M200.41897,176.096698 C200.227148,176.031957 198.485169,175.539368 198.081944,175.776984 C198.679388,175.510035 199.412106,175.184941 200.068895,175.097983 C204.35311,174.529024 209.561066,178.239232 210.13633,181.81909 C209.657576,180.592826 207.111145,179.578489 205.959616,178.968568 C204.136711,178.002484 202.395531,176.832456 200.41897,176.096698 Z M202.227687,183.908269 C202.969797,184.089822 204.54713,185.083504 205.275252,185.072742 C202.345977,185.143906 199.703236,184.81829 196.883858,184.158729 C197.036117,184.200212 198.643022,183.702937 198.694974,183.695647 C199.910043,183.523987 201.052381,183.620492 202.227687,183.908269 Z M190.882541,197.765243 C195.171151,197.522941 200.218656,198.149351 204.314046,199.181739 C206.346955,199.694288 208.253382,200.468058 210.006351,201.476666 C211.420436,202.290531 213.935896,203.408661 214.881616,204.614097 C211.142494,198.162369 203.032039,194.811448 194.722769,196.473197 C193.615199,196.695886 191.914181,197.749796 190.882541,197.765243 Z M189.923153,210.197773 C192.611453,209.233424 195.584487,208.30431 198.505969,208.169273 C201.277391,208.042395 204.351332,208.458613 206.915546,209.342078 C206.033367,209.102206 203.92333,209.674289 202.995793,209.779298 C201.699199,209.926138 200.399608,210.077837 199.099817,210.196558 C197.506299,210.342009 195.898395,210.422718 194.298883,210.41942 C193.159543,210.41699 190.979371,209.87858 189.923153,210.197773 Z M179.458947,227.410508 C179.711912,231.383499 182.010574,234.84533 185.39043,237.491388 C188.973097,240.296087 193.769036,241.572686 196.369816,245.319691 C197.637437,247.145462 198.312809,249.270812 198.20431,251.417686 C198.148362,252.524014 197.870221,253.636069 197.5695,254.712196 C197.371684,255.420184 196.66734,256.580144 196.667939,257.270775 C196.69911,253.384221 196.751661,248.859281 194.031592,245.598095 C191.300932,242.324066 186.539161,241.170701 183.203065,238.482813 C179.924714,235.841442 177.437828,232.389157 176.877749,228.498264 C176.425569,225.354411 176.648562,219.871892 179.90773,217.738557 C179.246345,218.128392 179.377224,220.111764 179.361438,220.669267 C179.298097,222.900321 179.317079,225.185182 179.458947,227.410508 Z M177.005789,242.672904 C177.402221,243.19257 179.575399,243.82436 180.213805,244.182606 C181.67045,245.000116 183.07914,245.92923 184.234665,247.059684 C186.55111,249.326146 188.044121,252.504886 188.151821,255.553623 C188.151821,254.833139 186.505553,253.096583 186.043183,252.481107 C185.275297,251.458613 184.407904,250.511969 183.524526,249.564283 C181.371329,247.253734 179.135209,244.999942 177.005789,242.672904 Z M229.167807,153.791051 C230.371887,154.841663 231.178936,156.147595 231.842519,157.49987 C233.373295,160.619424 233.65823,164.217333 232.431571,167.500388 C232.634582,166.795698 232.030544,165.31585 231.860502,164.601614 C231.488248,163.038626 230.906389,161.56225 230.298355,160.059664 C229.118053,157.144401 228.163741,154.41208 226.113648,151.858014 C226.644354,152.52556 228.442481,153.157872 229.167807,153.791051 Z M171.509602,41.9832998 C171.510002,42.3148163 172.426549,43.2758671 172.633357,43.6374111 C173.149677,44.5392749 173.557297,45.4857459 173.696967,46.4924453 C173.85542,47.6336606 173.6616,48.7505762 173.315522,49.8605491 C173.109914,50.5202844 172.131624,51.7949741 172.132423,52.3894475 C171.972572,48.891167 171.198691,45.5298324 171.509602,41.9832998 Z M179.146978,48.8048339 C179.312224,50.0477605 178.906202,51.4491555 178.183074,52.546805 C178.314952,52.2364639 177.729296,50.1642252 177.710314,49.7849773 C177.650969,48.6118253 177.77925,47.4056953 177.856378,46.2332376 C177.857178,46.8738803 179.039478,47.9958294 179.146978,48.8048339 Z M118.377388,50.3732542 C117.142336,51.8857333 115.738043,53.3032702 114.227248,54.6164922 C113.2036,55.5060327 111.243024,56.5057893 110.46315,57.5267214 C113.964293,51.8147436 118.00913,46.8878178 122.764906,41.8951095 C122.049172,42.8155452 121.862346,44.8121078 121.337434,45.8885819 C120.563354,47.4758692 119.527518,48.9645693 118.377388,50.3732542 Z M124.275361,52.8515919 C124.845431,52.5155626 125.378934,50.859195 125.81333,50.3013446 C126.54465,49.3623371 127.437619,48.4554398 128.390733,47.6728177 C128.186123,47.8927295 127.788693,49.7158968 127.5657,50.0739694 C126.843372,51.2344508 125.56616,52.1809219 124.275361,52.8515919 Z'
+              id='Lights'
+              fillOpacity='0.6'
+              fill='#FFFFFF'
+              fillRule='evenodd'
+            />
+            <FacialHair />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairDreads.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairDreads.tsx
new file mode 100644
index 000000000..5b2cbf8c0
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairDreads.tsx
@@ -0,0 +1,75 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class LongHairDreads extends React.Component {
+  static optionValue = 'LongHairDreads'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M85.718098,185.073467 C86.8059563,185.024663 87.900098,185 89,185 L89,185 L93,185 L93,166.610951 C81.2286384,161.018987 71.7176526,151.441235 66.2110974,139.621749 C63.4467803,131.013632 63.6113966,121.686985 63.000708,112.826222 C62.1957105,101.145772 62.8887367,89.7481762 65.5369124,78.2476834 C67.9263583,67.8722634 71.3610508,62.3068417 79.1631677,53.9925443 C83.5224388,49.3467459 90.0678681,49.0779432 96.5828586,47.4293172 C103.17612,45.7598396 109.194306,43.2191332 113.317676,38.4387068 C122.400941,48.8499369 146.671683,45.1030183 155.554378,56.4493915 C166.355804,70.2471725 166.476604,79.1499376 167.747424,95.0917937 C168.700138,107.043152 167.218859,128.656014 166.803718,141.630125 C161.185514,152.525228 152.097197,161.339247 141,166.610951 L141,185 L145,185 C151.635699,185 158.061736,185.89767 164.1633,187.578199 C162.113115,190.752042 159.66929,193.757151 157.112045,196.551224 C153.280561,200.738743 149.430596,205.07041 145.111547,208.917959 C140.170678,213.319433 135.443967,216.514694 132.444114,221.999991 C131.086326,224.482676 128.707208,227.093643 131.224932,229.817026 C133.524148,232.304244 137.149083,231.79157 139.609734,229.99245 C143.247171,227.332528 145.947527,223.133676 149.2996,220.076669 C146.062216,225.891963 141.557817,234.561189 143.870623,241.081807 C144.65714,243.298862 145.455615,243.254893 146.671536,244.732627 C148.591355,244.77569 149.350151,245.644199 148.948467,247.337701 C149.128382,247.821818 149.308297,248.305028 149.488756,248.789145 C150.944383,251.382887 153.73062,253.199684 157.268587,251.977153 C168.828809,247.982737 155.493353,230.015568 168.22112,224.674872 C170.498594,227.504326 167.135107,235.453723 167.044334,238.930932 C166.932906,243.218176 167.166089,252.943574 173.685972,254.109896 C182.182202,255.630241 178.905139,247.513126 179.240509,244.059941 C179.630235,240.043766 182.101213,234.747946 184.111805,231.19141 C182.888817,234.970512 180.603189,243.344644 186.927937,245.060811 C194.245208,247.046687 193.409228,238.475373 194.5197,234.910224 C194.748535,240.185647 201.565196,252.659813 207.724704,242.806586 C210.898493,237.730613 208.733533,229.366 208.385661,223.95323 C212.799287,228.512903 216.32584,222.602417 216.224196,219.322843 C217.902135,224.075166 224.207315,237.325369 229.795009,226.807615 C233.19274,220.412559 229.568892,211.82266 227.311529,205.648358 C233.255792,206.168285 232.061613,200.411919 231.17617,197.553001 C229.869476,193.331485 230.56685,192.711833 230.835907,188.347077 C239.08591,193.151981 238.833159,180.113465 238.377664,176.915484 C237.232404,168.863643 230.969077,161.653567 226.135287,154.862787 C222.669068,149.991702 216.20028,141.510593 218.096726,135.636824 C220.053506,138.105004 224.604107,138.079166 226.413041,135.494944 C227.944765,133.306899 226.321725,129.699141 225.582497,127.51291 C223.561578,121.532617 219.523001,117.668749 215.871976,112.532035 C208.763972,102.531035 209.78639,89.3991407 209.129238,78.2191259 C208.309564,64.2703984 205.315147,50.5387982 192.648801,40.3918378 C185.862036,34.9554966 177.590835,30.4783232 171.278589,24.7101717 C169.557166,23.1372455 168.829352,21.1885396 167.213378,19.672275 C165.399552,17.9706136 164.553244,18.373591 163.055221,15.951194 C160.386934,11.6367527 157.252824,7.59700681 150.804147,7.39438491 C146.585112,7.26247669 141.249081,10.823092 137.446405,10.3027118 C134.324254,9.87616325 132.352254,5.42437419 129.78996,3.93032097 C125.824219,1.61762086 123.056462,2.51559399 118.817859,3.85507435 C112.508874,5.8486563 108.488235,6.54355423 102.06293,4.16059373 C97.6906135,2.53871192 93.5645254,-0.846479064 88.4018873,0.357013447 C84.3524397,1.30167574 82.5435053,4.56991717 80.1584078,7.07481345 C77.6972133,9.66084915 78.8865008,8.80593884 75.2887432,9.38026087 C71.6083661,9.9681817 68.7020041,10.5017074 65.9103313,12.9118655 C61.397779,16.8074642 64.5237352,22.8666297 60.95696,26.3007763 C59.0317058,28.154744 55.0219374,29.0377585 52.7922952,30.954734 C50.3582782,33.0471337 48.3677981,35.5901066 46.5441878,38.0655389 C42.992632,42.8881215 40.5678554,48.1435988 37.9642508,53.3460408 C33.1206766,63.0274694 28.8027153,73.0171372 26.9622549,83.4183949 C26.0170215,88.7645307 24.4238764,93.9946236 23.4503783,99.3303337 C22.6997357,103.444873 23.0198867,107.95151 21.5539323,111.946834 C19.8145722,116.686464 15.6553275,121.042608 13.4023127,125.704271 C10.4144183,131.887186 8.40763163,137.818976 7.77222166,144.475128 C7.14822625,151.019317 8.88486854,156.786109 9.65073052,163.202016 C10.0942673,166.919017 9.32731826,167.341033 6.77100254,170.849066 C4.80389503,173.548878 2.81124068,176.221946 1.54639979,179.227278 C-0.815325022,184.841763 -0.684329469,190.304395 3.42490864,195.240301 C6.24484612,198.627758 15.7238148,202.173415 14.9476254,194.622463 C14.5872518,191.114429 10.1763434,189.527451 11.0188459,185.502664 C11.6020751,182.715366 14.443211,180.786605 17.8920358,179.924895 C20.328227,179.316576 21.5278419,179.343321 22.6269,182.014575 C23.6232272,184.435613 22.3024007,189.72146 21.996382,192.265793 C21.8735397,193.288422 21.691994,194.184582 21.5686081,195.131511 C20.7005588,201.806248 20.5407551,207.947459 16.8870119,214.076432 C14.6426939,217.842389 10.2513533,223.149088 15.258536,226.778604 C19.2177543,229.649308 26.0490909,227.900051 29.1359115,224.896532 C32.3923196,228.923586 31.668311,233.320073 30.4502154,237.765516 C29.6941373,240.525616 27.6264731,244.567629 30.8812505,246.798736 C35.2888976,249.820386 42.4838692,245.061265 45.7886533,242.659719 C47.6992316,246.926565 49.4918595,262.485842 57.0243756,253.211017 C59.2224919,250.505765 62.8816706,247.867147 63.5785017,244.677325 C64.7346326,239.386945 63.9046317,233.818695 64.3834993,228.474826 C66.7870774,235.472308 68.4211208,238.262053 69.8925107,245.444931 C70.7774101,249.766172 71.124195,264.264472 80.0666799,262.354749 C86.9474795,260.885627 82.5468986,251.830921 81.6679782,248.139757 C79.9846038,241.070655 79.1724081,238.077382 77.5455629,230.999667 C80.078506,235.625521 82.2918416,240.371497 84.725315,245.034067 C87.115848,249.613685 97.8039252,259.060923 100.930715,255.083614 C104.057505,251.106306 96.435013,245.438857 94.7010885,240.623528 C91.0924599,230.599863 86.7201436,220.618354 85.6835937,210.116466 C85.1851583,205.067237 86.1200644,200.404213 86.5299011,195.413459 C86.8096981,192.003861 86.3887166,188.510775 85.718098,185.073467 Z'
+            id={path2}
+          />
+        </defs>
+        <mask id={mask2} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Long-Hair/Dreads' mask={`url(#${mask2})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <g
+              id='template-for-hairstyles'
+              strokeWidth='1'
+              fillRule='evenodd'
+              transform='translate(63.000000, 87.000000)'
+            />
+            <FacialHair />
+            <g
+              id='Hair'
+              strokeWidth='1'
+              fillRule='evenodd'
+              transform='translate(16.000000, 14.000000)'>
+              <mask id={mask1} fill='white'>
+                <use xlinkHref={'#' + path2} />
+              </mask>
+              <use id='No-Woman' fill='#8D5A5A' xlinkHref={'#' + path2} />
+              <HairColor maskID={mask1} />
+              <path
+                d='M85.718098,185.073467 C86.8059563,185.024663 87.900098,185 89,185 L89,185 L93,185 L93,166.610951 C81.2286384,161.018987 71.7176526,151.441235 66.2110974,139.621749 C66.7437304,141.280375 67.3851037,142.912325 68.1617154,144.509125 C73.916823,156.341882 81.4183567,166.92083 84.4877837,179.589912 C84.9233139,181.387079 85.3569126,183.222183 85.718098,185.073467 Z M164.1633,187.578199 C158.061736,185.89767 151.635699,185 145,185 L145,185 L141,185 L141,166.610951 C151.900717,161.432585 160.863061,152.836228 166.502046,142.206866 C166.424719,145.200638 166.492065,148.178617 166.874747,151.055581 C167.944997,159.099715 170.876362,166.366 169.515856,174.635875 C168.770949,179.167686 166.790265,183.511457 164.1633,187.578199 Z'
+                id='Shadows'
+                fillOpacity='0.24'
+                fill='#000000'
+                mask={`url(#${mask1})`}
+              />
+              <path
+                d='M49.3607552,108.248307 C49.2357387,105.826133 47.3806025,97.711311 49.6885159,96.3093564 C52.2181977,94.7715832 51.6909542,104.01582 51.7170446,104.962941 C51.7605286,106.500263 52.928074,118.098087 50.7897482,118.046647 C48.6579451,117.995659 49.4428313,109.828495 49.3607552,108.248307 Z M57.7950752,165.998415 C57.7863784,167.012316 56.722651,166.95095 55.9633116,166.68563 C55.0256879,166.358041 55.5996767,164.201639 55.5502136,163.49457 C55.4197616,161.635525 54.5272525,156.156756 55.8904759,154.62169 C58.6158357,151.553363 57.8059462,164.569838 57.7950752,165.998415 Z M32.1210881,179.161492 C34.0501471,179.106894 32.2645853,141.329473 29.29952,141.371437 C27.2171799,141.400766 30.6611128,179.198041 32.1210881,179.161492 Z M34.3531219,198.516092 C31.9555228,198.516092 32.3963419,206.978357 33.8084848,207.654742 C35.9484412,208.679924 37.0349977,198.516092 34.3531219,198.516092 Z M49.5898072,202.054956 C49.6110057,203.112626 48.4113908,203.129321 47.6107416,202.798574 C46.701926,202.423155 47.082411,199.293461 47.0465367,198.598576 C46.9334783,196.41149 45.0299661,187.926664 46.7611729,186.367683 C48.7353466,184.59031 48.7782871,186.540953 49.3093354,187.8662 C50.8731288,191.768841 49.505557,197.898275 49.5898072,202.054956 Z M190.242397,122.33319 C190.352194,123.795609 191.311016,133.35074 189.717871,134.079016 C186.975661,135.332969 188.156795,129.428696 188.167666,128.666127 C188.274745,121.229044 187.19906,113.85423 186.381017,106.456855 C186.225562,105.052193 183.755671,94.2318284 185.564605,93.3352452 C188.272028,91.9937546 187.86817,95.5809897 188.023082,96.7451491 C189.152035,105.213731 189.651014,113.824449 190.242397,122.33319 Z M187.023004,155.587221 C184.490605,155.085459 183.16543,163.680835 184.321017,164.602687 C186.238118,166.132789 189.670093,156.113348 187.023004,155.587221 Z M186.754925,193.385172 C185.616188,193.158658 177.321615,209.117567 178.004314,210.020016 C179.303942,211.738731 190.833725,194.199633 186.754925,193.385172 Z M166.332555,200.758587 C164.551342,199.95631 156.998715,211.509915 158.926686,212.377619 C160.674743,213.163653 168.488275,201.725562 166.332555,200.758587 Z M208.425286,157.447168 C206.274459,157.447168 206.370123,169.269251 208.025233,170.015125 C209.736329,170.785817 210.967469,157.447168 208.425286,157.447168 Z M178.139603,48.8435128 C177.531371,47.9735519 170.964743,40.2233192 175.668081,41.3306242 C177.959145,41.8698375 181.116083,48.6833281 182.149372,50.7413632 C182.743472,51.9235715 186.133593,57.2006425 182.541271,56.8270286 C181.563968,56.7259543 178.951667,50.0063184 178.139603,48.8435128 Z M155.04775,33.3564939 C154.201443,33.7373274 154.215575,34.0946972 155.090147,34.4281522 C155.936998,34.0473186 155.922322,33.6904 155.04775,33.3564939 Z M70.6188876,41.486432 C68.6137316,43.3296843 61.07578,54.0047545 58.4928303,54.1116947 C53.7862308,54.3066237 62.7711125,45.0867526 63.7902688,43.9135688 C64.2452201,43.387441 66.275923,40.8222295 67.5119557,40.1914176 C68.7729918,39.5475202 72.9556091,39.3322861 70.6188876,41.486432 Z M43.2540252,69.9805849 C41.0711283,69.5519216 37.4190158,80.245492 38.693097,81.5359942 C40.6167205,83.4857354 45.7005438,70.4661025 43.2540252,69.9805849 Z M68.1928608,188.992366 C68.6054153,190.333405 72.8244505,200.071733 71.7639844,201.353211 C70.1425747,203.310623 69.6772959,200.536495 69.1467911,199.385872 C67.9689182,196.830588 64.9087316,190.540066 65.4006444,187.850317 C65.8784249,185.241788 67.775958,187.648619 68.1928608,188.992366 Z M59.986234,211.816206 C57.6913658,211.816206 57.9560747,221.618156 59.3225594,222.200687 C61.4391432,223.102685 62.8012795,211.816206 59.986234,211.816206 Z M221.791072,203.446532 C221.927503,204.049819 223.845148,209.009228 221.128485,208.290879 C219.566322,207.878008 219.325529,203.506094 218.926564,202.180847 C217.697597,198.095009 213.646519,193.018282 213.294842,188.98659 C212.955123,185.090266 215.135302,186.575246 216.80998,189.875503 C219.046145,194.283064 220.722996,198.746577 221.791072,203.446532 Z M202.089015,202.950817 C199.957212,202.941341 199.853937,213.724254 201.187265,214.35281 C203.051098,215.231344 204.808395,202.950817 202.089015,202.950817 Z M208.249611,114.654432 C209.831341,114.242012 204.839921,101.328868 203.071753,101.471004 C200.377376,101.688494 205.847663,115.273512 208.249611,114.654432 Z M181.434114,170.746831 C180.587263,171.127665 180.601939,171.485034 181.476511,171.818489 C182.322818,171.437656 182.308686,171.080286 181.434114,170.746831 Z M157.216135,225.987499 C158.009718,225.987499 158.337478,224.763778 157.165041,224.736253 C156.389939,224.742571 155.980645,225.987499 157.216135,225.987499 Z M58.6844317,170.628746 C58.7137834,168.720066 56.215084,170.119764 56.230847,171.730185 C56.26346,174.943806 58.6317074,173.476424 58.6844317,170.628746 Z M52.5187808,122.883143 C51.7148704,122.883143 51.3854791,124.119498 52.5698745,124.148828 C53.3536737,124.142962 53.7673152,122.883143 52.5187808,122.883143 Z M33.3865269,185.392722 C33.3087993,183.451554 31.6863025,185.43604 31.7770753,185.438747 C32.0651568,185.445967 33.4474045,186.856043 33.3865269,185.392722 Z M37.5995831,84.0632577 C35.2318792,84.0632577 35.5754028,89.8168218 37.0864719,90.1859235 C39.6063697,90.801845 39.9509805,84.0632577 37.5995831,84.0632577 Z M50.212933,208.325849 C47.9273051,208.325849 47.7729369,216.139704 49.3503191,216.625673 C51.8011861,217.379669 52.5931385,208.325849 50.212933,208.325849 Z M31.4567613,213.932223 C30.5849071,214.323435 30.5990394,214.691634 31.4991582,215.035467 C32.371556,214.644256 32.3568801,214.276959 31.4567613,213.932223 Z M201.455507,217.282881 C199.135636,217.282881 199.226409,226.836207 200.65051,227.481458 C202.64099,228.383907 204.139014,217.282881 201.455507,217.282881 Z M177.94561,226.161536 C175.534966,225.679629 174.272299,233.567034 175.395817,234.451885 C177.248236,235.910694 180.42148,226.656078 177.94561,226.161536 Z M157.46508,233.451204 C155.467534,233.451204 155.95836,237.025805 157.110686,237.557799 C159.104971,238.478297 159.694179,233.451204 157.46508,233.451204 Z M86.479514,19.5090896 C84.8080977,19.5090896 74.3192131,24.2532644 78.2392958,25.6588288 C80.6358078,26.5179603 90.7371413,19.5090896 86.479514,19.5090896 Z'
+                id='Highlights'
+                fillOpacity='0.300000012'
+                fill='#FFFFFF'
+                mask={`url(#${mask1})`}
+              />
+            </g>
+            {this.props.children}
+            <g
+              id='Group-74'
+              strokeWidth='1'
+              fillRule='evenodd'
+              transform='translate(44.000000, 33.000000)'
+            />
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairFrida.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairFrida.tsx
new file mode 100644
index 000000000..8cd0b4540
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairFrida.tsx
@@ -0,0 +1,362 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+
+export default class LongHairFrida extends React.Component {
+  static optionValue = 'LongHairFrida'
+  private filter1 = uniqueId('react-filter-')
+  private filter2 = uniqueId('react-filter-')
+  private filter3 = uniqueId('react-filter-')
+  private filter4 = uniqueId('react-filter-')
+  private filter5 = uniqueId('react-filter-')
+  private filter6 = uniqueId('react-filter-')
+  private filter7 = uniqueId('react-filter-')
+  private mask1 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const {
+      filter1,
+      filter2,
+      filter3,
+      filter4,
+      filter5,
+      filter6,
+      filter7,
+      mask1,
+      path1,
+      path2
+    } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path2} x='0' y='0' width='264' height='280' />
+          <filter
+            x='-3.8%'
+            y='-6.7%'
+            width='107.7%'
+            height='126.7%'
+            filterUnits='objectBoundingBox'
+            id={filter5}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+          <filter
+            x='-6.7%'
+            y='-3.4%'
+            width='113.3%'
+            height='113.8%'
+            filterUnits='objectBoundingBox'
+            id={filter6}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+          <filter
+            x='-6.7%'
+            y='-3.4%'
+            width='113.3%'
+            height='113.8%'
+            filterUnits='objectBoundingBox'
+            id={filter7}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+          <filter
+            x='-3.8%'
+            y='-3.8%'
+            width='107.7%'
+            height='115.4%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+          <filter
+            x='-2.5%'
+            y='-2.5%'
+            width='105.0%'
+            height='110.0%'
+            filterUnits='objectBoundingBox'
+            id={filter2}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+          <filter
+            x='-2.7%'
+            y='-2.7%'
+            width='105.4%'
+            height='110.8%'
+            filterUnits='objectBoundingBox'
+            id={filter3}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+          <filter
+            x='-1.8%'
+            y='-1.9%'
+            width='103.6%'
+            height='107.4%'
+            filterUnits='objectBoundingBox'
+            id={filter4}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+          <path
+            d='M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path2} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Long-Hair/Frida' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <g
+              id='Cabello'
+              strokeWidth='1'
+              fillRule='evenodd'
+              transform='translate(57.000000, 12.000000)'>
+              <path
+                d='M132,85.9365741 L132,86.1659169 C137.155374,87.0308248 141.196116,91.1828748 141.893354,96.3931952 C144.449672,93.4871212 146,89.6746099 146,85.5 C146,83.370043 145.596416,81.3343479 144.861548,79.4652142 C148.026608,76.4588698 150,72.2098901 150,67.5 C150,61.6639649 146.970105,56.5355997 142.397534,53.6021248 C143.424844,51.4510861 144,49.0427105 144,46.5 C144,38.865183 138.814518,32.4415002 131.77335,30.5587463 C131.922635,29.560863 132,28.5394662 132,27.5 C132,16.1781626 122.821837,7 111.5,7 C108.870853,7 106.357304,7.49493913 104.047446,8.3967274 C100.317449,3.30576666 94.2947759,0 87.5,0 C83.2377504,0 79.2793114,1.30076749 76,3.52698535 C72.7206886,1.30076749 68.7622496,0 64.5,0 C57.7052241,0 51.6825514,3.30576666 47.9525545,8.3967274 C45.6426956,7.49493913 43.1291474,7 40.5,7 C29.1781626,7 20,16.1781626 20,27.5 C20,28.5394662 20.0773647,29.560863 20.2266501,30.5587463 C13.1854816,32.4415002 8,38.865183 8,46.5 C8,48.6917361 8.4273349,50.7836628 9.20323008,52.6970055 C3.75045759,55.3899422 0,61.0069879 0,67.5 C0,72.9379417 2.63063706,77.7614652 6.68874609,80.7674054 C6.2406808,82.2665254 6,83.8551557 6,85.5 C6,89.6746099 7.55032816,93.4871212 10.1066457,96.3931952 C10.8038839,91.1828748 14.8446259,87.0308248 20,86.1659169 L20,85.9365741 C20.0276665,85.957925 20.0554443,85.9790669 20.0833333,86 C22.985911,38.8525302 68.5527463,55.7423492 76.000002,29.3361688 C83.4472619,55.7423461 129.014089,38.8525344 131.916667,86 C131.944556,85.9790669 131.972333,85.957925 132,85.9365741 Z M52,168.610951 L52,172.811832 C51.1847358,172.935746 50.3498715,173 49.5,173 C42.6790709,173 36.8248202,168.861157 34.3116389,162.957863 C25.7536314,162.348807 19,155.213101 19,146.5 C19,145.029028 19.1924867,143.603013 19.5536459,142.245771 C12.8575367,140.144362 8,133.88945 8,126.5 C8,122.755519 9.24731211,119.302363 11.3491137,116.533355 C13.0865598,119.870864 16.346706,122.289132 20.2085808,122.867187 C21.9518066,143.114792 34.4692178,160.282984 52,168.610951 Z M100,168.610951 L100,172.811832 C100.815264,172.935746 101.650128,173 102.5,173 C109.320929,173 115.17518,168.861157 117.688361,162.957863 C126.246369,162.348807 133,155.213101 133,146.5 C133,145.029028 132.807513,143.603013 132.446354,142.245771 C139.142463,140.144362 144,133.88945 144,126.5 C144,122.755519 142.752688,119.302363 140.650886,116.533355 C138.91344,119.870864 135.653294,122.289132 131.791419,122.867187 C130.048193,143.114792 117.530782,160.282984 100,168.610951 Z'
+                fill='#1F3540'
+              />
+            </g>
+            <g
+              id='Ornamentos'
+              strokeWidth='1'
+              fillRule='evenodd'
+              transform='translate(67.000000, 0.000000)'>
+              <g
+                id='hoja'
+                filter={`url(#${filter5})`}
+                opacity='0.899999976'
+                transform='translate(120.000000, 64.500000) scale(1, -1) rotate(-20.000000) translate(-120.000000, -64.500000) translate(107.000000, 57.000000)'
+                fillRule='nonzero'>
+                <path
+                  d='M3.61111111,10 C3.61111111,10 1.95,0 13,0 C20.2222222,0 25.2777778,5.71428571 25.2777778,5.71428571 C25.2777778,5.71428571 19.8611111,14.2857143 11.5555556,14.2857143 C5.05555556,14.2857143 3.61111111,10 3.61111111,10 Z'
+                  id='leaf'
+                  fill='#5DD362'
+                />
+                <path
+                  d='M25.2777778,5.71428571 C25.2777778,5.71428571 19.8611111,14.2857143 11.5555556,14.2857143 C7.22222222,14.2857143 5.12777778,12.3571429 4.18888889,11.0714286 C2.09444444,12.8571429 1.37222222,14.5 1.37222222,14.5714286 C1.3,14.8571429 1.01111111,15 0.722222222,15 C0.65,15 0.505555556,15 0.433333333,14.9285714 C0.0722222222,14.7857143 -0.0722222222,14.3571429 0.0722222222,14 C0.144444444,13.7857143 1.95,9.85714286 7.43888889,7.28571429 C15.3833333,3.14285714 25.2777778,5.71428571 25.2777778,5.71428571 Z'
+                  id='leaf'
+                  fill='#42BC53'
+                />
+              </g>
+              <g
+                id='hoja'
+                filter={`url(#${filter6})`}
+                transform='translate(93.307368, 21.745191) scale(-1, -1) rotate(-120.000000) translate(-93.307368, -21.745191) translate(85.807368, 7.245191)'>
+                <path
+                  d='M15,12 C15,5.9 9,0 9,0 C9,0 1.7,4.3 1,13 C0.3,21.7 6.8,23.7 6.8,23.7 C6.8,23.7 15,20.8 15,12 Z'
+                  id='leaf'
+                  fill='#5DD362'
+                />
+                <path
+                  d='M8,29 C8.1,29 8.2,29 8.3,28.9 C8.8,28.7 9.1,28.1 8.9,27.6 C8.4,26.1 8,24.7 7.8,23.2 C10,22.2 15,18.9 15,12 C15,5.9 9,0 9,0 C9,0 8.6,1.1 8,3 C8,3 8,3 8,3 C7.8,3.5 2.8,16.6 7.1,28.3 C7.2,28.7 7.6,29 8,29 Z'
+                  id='leaf'
+                  fill='#42BC53'
+                />
+              </g>
+              <g
+                id='hoja'
+                filter={`url(#${filter7})`}
+                transform='translate(29.307368, 59.745191) rotate(-120.000000) translate(-29.307368, -59.745191) translate(21.807368, 45.245191)'>
+                <path
+                  d='M15,12 C15,5.9 9,0 9,0 C9,0 1.7,4.3 1,13 C0.3,21.7 6.8,23.7 6.8,23.7 C6.8,23.7 15,20.8 15,12 Z'
+                  id='leaf'
+                  fill='#5DD362'
+                />
+                <path
+                  d='M8,29 C8.1,29 8.2,29 8.3,28.9 C8.8,28.7 9.1,28.1 8.9,27.6 C8.4,26.1 8,24.7 7.8,23.2 C10,22.2 15,18.9 15,12 C15,5.9 9,0 9,0 C9,0 8.6,1.1 8,3 C8,3 8,3 8,3 C7.8,3.5 2.8,16.6 7.1,28.3 C7.2,28.7 7.6,29 8,29 Z'
+                  id='leaf'
+                  fill='#42BC53'
+                />
+              </g>
+              <g
+                id='Flor'
+                filter={`url(#${filter1})`}
+                transform='translate(13.000000, 42.000000) scale(-1, 1) translate(-13.000000, -42.000000) translate(0.000000, 29.000000)'>
+                <path
+                  d='M24.4244753,20.9561089 C25.2601813,19.8468762 25.6139026,18.4784184 25.4208747,17.1027473 C25.2278468,15.7270762 24.5099609,14.5094298 23.401533,13.6738657 C23.1024018,13.448127 22.7077101,13.2632031 22.2596302,13.1057873 C22.7130645,12.9646232 23.1137179,12.7934099 23.4204085,12.5786628 C25.7688628,10.9342574 26.3421384,7.68540233 24.6974016,5.33647474 C23.0526648,2.98754715 19.8036678,2.41507618 17.4552135,4.05948158 C17.148523,4.2742286 16.8506035,4.59216121 16.5623958,4.97030055 C16.5681989,4.4950724 16.5289465,4.06126726 16.4191304,3.70296871 C16.0132035,2.3748027 15.1137169,1.2836091 13.8873598,0.632188307 C12.6611446,-0.0200371698 11.2540931,-0.154883395 9.92559572,0.250570203 C7.18364131,1.0892266 5.6350141,4.00181908 6.47286581,6.7436316 C6.58216096,7.10017888 6.78669399,7.47891226 7.05541252,7.86771872 C6.6074755,7.71655089 6.18638481,7.62487741 5.81372806,7.61849197 C2.94678437,7.56848119 0.573854142,9.85989025 0.523370073,12.7271653 C0.504358584,13.8654889 0.853022045,14.9255192 1.46080913,15.7935291 C2.38423063,17.1113044 3.90375474,17.9869973 5.63218533,18.0167186 C6.00484208,18.0231041 6.42832327,17.945939 6.88109576,17.8108811 C6.59932552,18.1901555 6.38197496,18.5617056 6.2605192,18.9140724 C5.69762142,20.5489044 5.99965968,22.2756795 6.92293929,23.5942594 C7.53072638,24.4622693 8.40824188,25.1534041 9.48422896,25.5235908 C12.1953795,26.4571485 15.1603315,25.0102268 16.0934159,22.2994077 C16.2148717,21.947041 16.272275,21.5203224 16.2839005,21.0473654 C16.5573519,21.4328579 16.8436218,21.7550638 17.1409542,21.9792407 C18.2505182,22.81542 19.6186447,23.168668 20.9943157,22.9756401 C22.3707915,22.7827541 23.5887693,22.0653415 24.4244753,20.9561089 Z'
+                  fill='#4ACAD3'
+                  fillRule='nonzero'
+                />
+                <path
+                  d='M11.178297,8.63990176 C10.9452631,7.87696713 11.3743225,7.06939957 12.1372572,6.83636565 C12.9001918,6.60333173 13.7077594,7.03239119 13.9407933,7.79532582 C14.1738272,8.55826044 13.7087793,11.9767907 13.7087793,11.9767907 C13.7087793,11.9767907 11.4113309,9.40283638 11.178297,8.63990176 Z M8.9355486,14.4373723 C8.1377895,14.4232361 7.50243635,13.7656743 7.5165726,12.9679152 C7.53070884,12.1701561 8.18827062,11.534803 8.98602972,11.5489392 C9.78378882,11.5630754 12.8914353,13.0618808 12.8914353,13.0618808 C12.8914353,13.0618808 9.73297629,14.4510353 8.9355486,14.4373723 Z M14.9931854,12.4189898 C14.9931854,12.4189898 16.7313261,9.4385895 17.3849366,8.98092648 C18.0385471,8.52326347 18.9389925,8.68203629 19.3966555,9.33564681 C19.8543185,9.98925733 19.6955457,10.8897027 19.0419352,11.3473657 C18.3883247,11.8050287 14.9931854,12.4189898 14.9931854,12.4189898 Z M11.9202121,19.2569641 C11.1657288,18.9973982 10.7651265,18.1754621 11.0246924,17.4209789 C11.2842584,16.6664957 13.670556,14.1745805 13.670556,14.1745805 C13.670556,14.1745805 14.0160946,17.6074345 13.7565287,18.3619178 C13.4966313,19.1159277 12.6746953,19.5165301 11.9202121,19.2569641 Z M17.2395979,17.2963365 C16.6023761,16.8164172 14.9694239,13.7771777 14.9694239,13.7771777 C14.9694239,13.7771777 18.3408473,14.5093818 18.978069,14.9893011 C19.6152908,15.4692204 19.7426018,16.3753059 19.2623511,17.0120544 C18.7824319,17.6492761 17.8763463,17.7765872 17.2395979,17.2963365 Z'
+                  fill='#FFFFFF'
+                />
+              </g>
+              <g
+                id='Flor'
+                filter={`url(#${filter2})`}
+                transform='translate(20.000000, 16.000000)'>
+                <path
+                  d='M30.5258511,33.0981022 L30.7843694,30.7838831 L33.0980227,30.5247992 C35.9451175,30.2051869 38.2084249,28.4080043 39.1519882,25.7142103 C40.2177395,22.6719541 39.217042,19.3553405 36.6052724,17.4325757 L34.7311566,16.052869 L35.6634061,13.9191036 C36.8915092,11.1127382 36.3082875,8.02353005 34.142278,5.85752056 C31.9762685,3.69151107 28.8870604,3.10828939 26.0801294,4.33582677 L23.9469296,5.26864203 L22.5666572,3.39396053 C20.6438924,0.78558504 17.3267131,-0.217940904 14.2844569,0.847810436 C11.5917943,1.79137373 9.79348029,4.05468111 9.4749994,6.90177585 L9.21591547,9.21542924 L6.90226208,9.47451317 C4.05460165,9.79355975 1.79129427,11.5918737 0.847730981,14.2845363 C-0.0896097682,16.9607941 0.549614762,19.8457897 2.51650298,21.812678 L2.51706867,21.8132437 C2.78576925,22.0819442 3.08049135,22.3348056 3.39388108,22.5656053 L5.26856258,23.9458777 L4.33518163,26.0796431 C3.10877562,28.8865742 3.6919973,31.9757823 5.85800679,34.1417918 C8.02401628,36.3078013 11.1132244,36.891023 13.9201555,35.664617 L16.0539209,34.731236 L17.4341933,36.6059175 C19.3513012,39.2165558 22.6741374,40.217819 25.7169593,39.1526333 C28.4096219,38.2079386 30.2073702,35.9451969 30.5258511,33.0981022 Z'
+                  fill='#FDB599'
+                  fillRule='nonzero'
+                />
+                <path
+                  d='M22.8816016,25.1907295 C23.087511,25.9589303 22.6315686,26.7486271 21.8633678,26.9545366 C21.095167,27.1604461 20.3049044,26.703938 20.0995606,25.9363028 C19.8942168,25.1686677 20,20 20,20 C20,20 17.50759,24.5288775 16.9452987,25.0911688 C16.3835731,25.6528945 15.4711225,25.6534601 14.9088312,25.0911688 C14.3465399,24.5288775 14.3471055,23.6164269 14.9088312,23.0547013 C15.4711225,22.49241 20,20 20,20 C20,20 14.831898,20.1063489 14.0636972,19.9004394 C13.2954963,19.6945299 12.8395539,18.904833 13.0454634,18.1366322 C13.2513729,17.3684314 14.0410697,16.912489 14.8092705,17.1183984 C15.5774713,17.3243079 20,20 20,20 C20,20 17.3243079,15.5774713 17.1183984,14.8092705 C16.912489,14.0410697 17.3684314,13.2513729 18.1366322,13.0454634 C18.904833,12.8395539 19.6945299,13.2954963 19.9004394,14.0636972 C20.1063489,14.831898 20,20 20,20 C20,20 22.49241,15.4711225 23.0547013,14.9088312 C23.6169926,14.3465399 24.5288775,14.3465399 25.0911688,14.9088312 C25.6534601,15.4711225 25.6534601,16.3830074 25.0911688,16.9452987 C24.5288775,17.50759 20,20 20,20 C20,20 25.1686677,19.8942168 25.9363028,20.0995606 C26.703938,20.3049044 27.1604461,21.095167 26.9545366,21.8633678 C26.7486271,22.6315686 25.9589303,23.087511 25.1907295,22.8816016 C24.4225287,22.6756921 20,20 20,20 C20,20 22.6751264,24.421963 22.8816016,25.1907295 Z'
+                  fill='#FFFFFF'
+                />
+              </g>
+              <g
+                id='Flor'
+                filter={`url(#${filter3})`}
+                transform='translate(89.000000, 26.000000)'>
+                <path
+                  d='M34.7579072,29.8221549 C35.9471811,28.2436316 36.4505537,26.2962107 36.1758602,24.338525 C35.9011667,22.3808393 34.8795597,20.6480348 33.3021815,19.4589627 C32.8764948,19.1377192 32.3148182,18.8745582 31.6771661,18.6505434 C32.322438,18.4496561 32.8925986,18.2060063 33.3290428,17.9004048 C36.6710739,15.5602894 37.4868893,10.9369187 35.1463023,7.59421406 C32.8057153,4.25150941 28.1821427,3.43683918 24.8401115,5.77695456 C24.4036673,6.08255608 23.979705,6.53499864 23.5695632,7.07312001 C23.5778216,6.3968338 23.5219623,5.77949571 23.3656856,5.26960932 C22.7880204,3.37952692 21.5079818,1.82667448 19.7627813,0.899652591 C18.0177827,-0.0285144339 16.0154402,-0.220410986 14.1248862,0.356580673 C10.2228742,1.55005325 8.01905852,5.69489638 9.21138596,9.59670651 C9.36692136,10.1041007 9.6579876,10.6430675 10.0403947,11.196369 C9.40294591,10.9812455 8.80370145,10.8507871 8.27338223,10.8417001 C4.19350083,10.7705309 0.816638586,14.0313823 0.744795872,18.1117353 C0.717741062,19.7316573 1.21391599,21.2401619 2.07884376,22.4754068 C3.39294359,24.3507024 5.55534329,25.5968808 8.01503297,25.6391765 C8.54535219,25.6482635 9.14799849,25.5384516 9.79232859,25.3462538 C9.39134786,25.8859905 9.08204129,26.414735 8.9092004,26.9161799 C8.10815356,29.2426717 8.53797723,31.7000054 9.85187515,33.5764461 C10.7168029,34.811691 11.965575,35.7952289 13.4967874,36.322033 C17.3549631,37.6505575 21.5743179,35.5914767 22.9021688,31.7337725 C23.0750097,31.2323275 23.1566991,30.6250741 23.173243,29.95202 C23.5623854,30.5006054 23.9697696,30.9591293 24.3928963,31.2781502 C25.9718913,32.4680977 27.9188405,32.9707967 29.8765262,32.6961032 C31.8353571,32.4216117 33.5686332,31.4006783 34.7579072,29.8221549 Z'
+                  fill='#F7D30C'
+                  fillRule='nonzero'
+                />
+                <path
+                  d='M15.9075765,12.2952448 C15.5759513,11.2095302 16.1865359,10.0602994 17.2722506,9.72867419 C18.3579653,9.397049 19.507196,10.0076336 19.8388212,11.0933483 C20.1704464,12.1790629 19.5086475,17.0438945 19.5086475,17.0438945 C19.5086475,17.0438945 16.2392017,13.3809595 15.9075765,12.2952448 Z M12.715973,20.5454914 C11.5807004,20.5253744 10.676544,19.5896134 10.696661,18.4543409 C10.716778,17.3190683 11.652539,16.4149119 12.7878115,16.4350289 C13.9230841,16.4551458 18.3455041,18.5880611 18.3455041,18.5880611 C18.3455041,18.5880611 13.850774,20.5649348 12.715973,20.5454914 Z M21.3364561,17.6731778 C21.3364561,17.6731778 23.8099641,13.4318389 24.7401021,12.7805492 C25.6702401,12.1292596 26.9516432,12.3552055 27.6029329,13.2853435 C28.2542225,14.2154816 28.0282766,15.4968846 27.0981386,16.1481743 C26.1680005,16.799464 21.3364561,17.6731778 21.3364561,17.6731778 Z M16.9633787,27.4041412 C15.889691,27.0347589 15.3196031,25.8650807 15.6889854,24.7913931 C16.0583677,23.7177054 19.4542528,20.1715184 19.4542528,20.1715184 C19.4542528,20.1715184 19.9459808,25.0567338 19.5765985,26.1304214 C19.2067446,27.2034356 18.0370664,27.7735236 16.9633787,27.4041412 Z M24.5332739,24.6140173 C23.6264583,23.9310553 21.3026416,19.6059836 21.3026416,19.6059836 C21.3026416,19.6059836 26.1004365,20.6479665 27.0072521,21.3309285 C27.9140676,22.0138905 28.095241,23.30332 27.4118074,24.209462 C26.7288453,25.1162776 25.4394159,25.297451 24.5332739,24.6140173 Z'
+                  fill='#FFFFFF'
+                />
+              </g>
+              <g
+                id='Flor'
+                filter={`url(#${filter4})`}
+                transform='translate(48.000000, 0.000000)'>
+                <path
+                  d='M54.1379237,31.5464048 C55.9625462,24.5630399 48.1438056,19.13187 45.1845324,17.3616591 C45.6989766,14.4276922 46.8574047,4.80065356 40.7169237,1.24584505 C34.6121663,-2.28828261 26.9236153,3.44959091 24.6013353,5.39402404 C24.4009276,5.26871855 24.1656352,5.12587117 23.8977086,4.97076479 C20.8314374,3.19565841 13.1300975,-0.380512394 7.84990403,4.73636964 C2.20473848,10.2044755 5.53732179,18.7392794 6.80518652,21.4340926 C4.64577053,23.4449497 -1.57937327,30.0260297 0.986877047,37.024011 C1.69277097,38.9530347 2.99822799,40.4795811 4.86875265,41.5624535 C8.89955964,43.8959428 14.4760657,43.5196765 16.591707,43.2691852 C17.5849083,45.1496134 20.4220029,49.9813784 24.4796026,52.3303784 C26.1496784,53.2972082 27.8550402,53.7431811 29.5502657,53.6552686 C36.4552712,53.2971895 39.4664791,43.6601819 40.2201879,40.7426742 C43.0812084,40.3465884 52.3062726,38.5442744 54.1379237,31.5464048 Z'
+                  fill='#FF7398'
+                  fillRule='nonzero'
+                />
+                <path
+                  d='M27.7643057,25.6030632 C27.7643057,25.6030632 31.4492792,33.7908502 28.1176886,34.3138653 C24.7835165,34.8339614 26.6574825,25.7216143 26.6574825,25.7216143 C26.6574825,25.7216143 19.5457139,31.7290717 18.5074329,28.7503567 C17.4680864,25.7710249 26.208593,24.7024398 26.208593,24.7024398 C26.208593,24.7024398 18.2208741,20.0098596 20.8149072,17.8660564 C23.4089403,15.7222531 27.0309781,23.9576566 27.0309781,23.9576566 C27.0309781,23.9576566 28.975509,15.0385915 31.8514465,16.7035111 C34.727384,18.3684307 27.9942413,24.5153028 27.9942413,24.5153028 C27.9942413,24.5153028 36.8711392,23.5256765 36.3635103,26.8673556 C35.8586276,30.2092 27.7643057,25.6030632 27.7643057,25.6030632 Z'
+                  fill='#FFFFFF'
+                />
+              </g>
+            </g>
+            <g
+              id='Arete'
+              strokeWidth='1'
+              fillRule='evenodd'
+              transform='translate(182.000000, 129.000000)'>
+              <rect
+                id='Cadenita'
+                fill='#E6E6E6'
+                x='9'
+                y='0'
+                width='2'
+                height='39'
+                rx='1'
+              />
+              <polygon
+                id='Rayo'
+                fill='#9177FF'
+                fillRule='nonzero'
+                points='20 37 10.57 37 17 20 6 20 0 41 8.636 41 4 60'
+              />
+            </g>
+            <FacialHair />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairFro.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairFro.tsx
new file mode 100644
index 000000000..ad6a9ba0a
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairFro.tsx
@@ -0,0 +1,62 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class LongHairFro extends React.Component {
+  static optionValue = 'LongHairFro'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private path3 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, path1, path2, path3 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M180.665797,104.495381 C181.518431,106.144109 182,108.015816 182,110 L182,123 C182,129.018625 177.569129,134.002364 171.791419,134.867187 C170.048193,155.114792 157.530782,172.282984 140,180.610951 L140,190.054182 C143.832093,191.949549 148.058707,193 152.5,193 C160.121477,193 167.110765,189.906604 172.559029,184.758484 C174.020475,184.918263 175.501874,185 177,185 C195.390093,185 211.259672,172.683502 218.621514,154.88375 C224.900145,149.813883 229,141.454126 229,132 C229,130.214987 228.853847,128.468986 228.57447,126.776775 C230.785923,120.339137 232,113.331199 232,106 C232,93.1344627 228.26103,81.2644681 221.954258,71.7251464 C221.984605,71.1545437 222,70.5793265 222,70 C222,59.0433596 216.493437,49.5565783 208.470603,44.9571334 C201.160166,27.369138 185.740722,14.9905991 167.696954,14.0567347 C163.273738,9.07458291 157.201041,6 150.5,6 C149.549121,6 148.610894,6.0619088 147.688236,6.18239195 C137.909703,2.19640473 127.211351,0 116,0 C104.788649,0 94.0902965,2.19640473 84.3117637,6.18239195 C83.3891064,6.0619088 82.4508793,6 81.5,6 C74.7989589,6 68.7262617,9.07458291 64.3030458,14.0567347 C46.2592779,14.9905991 30.8398341,27.369138 23.5293968,44.9571334 C15.5065631,49.5565783 10,59.0433596 10,70 C10,70.5793265 10.0153947,71.1545437 10.0457422,71.7251464 C3.73896962,81.2644681 0,93.1344627 0,106 C0,113.331199 1.21407678,120.339137 3.42552978,126.776775 C3.14615333,128.468986 3,130.214987 3,132 C3,141.454126 7.0998554,149.813883 13.3784857,154.88375 C20.7403278,172.683502 36.6099075,185 55,185 C56.4981261,185 57.9795252,184.918263 59.4409604,184.758485 C64.8892346,189.906604 71.878523,193 79.5,193 C83.9412925,193 88.1679073,191.949549 92,190.054182 L92,180.610951 C74.4692178,172.282984 61.9518066,155.114792 60.2085808,134.867187 C54.4308707,134.002364 50,129.018625 50,123 L50,110 C50,108.017039 50.4809755,106.146415 51.3326281,104.498428 C54.034525,103.696079 57.0103265,101.444735 59.9905531,98.1675057 C59.9937016,98.1669748 59.9968506,98.1664452 60,98.1659169 L60,98.1571139 C66.866448,90.6014009 73.7548744,77.602262 77.3694073,64.3345491 C88.4864044,66.0717584 101.905207,67.0867832 116.353789,67.0867832 C130.513023,67.0867832 143.683308,66.1120054 154.66752,64.4380466 C158.288087,77.6642508 165.154277,90.6101259 172,98.1475774 L172,98.1659169 C172.006563,98.167018 172.013125,98.1681244 172.019685,98.1692362 C174.995621,101.441388 177.967097,103.690532 180.665797,104.495381 Z'
+            id={path2}
+          />
+          <path
+            d='M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z'
+            id={path3}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Long-Hair/Fro' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <path
+              d='M67,109.777572 C76.0375502,108.717226 88.9217814,89.3309188 94.3694073,69.3345491 C105.486404,71.0717584 118.905207,72.0867832 133.353789,72.0867832 C147.513023,72.0867832 160.683308,71.1120054 171.66752,69.4380466 C177.129582,89.3913728 189.978479,108.706688 199,109.77655 L199,89 C199,66.1159733 187.353465,45.9521405 169.664405,34.1125124 C169.136033,36.5946509 168.784517,39.3353373 168.624132,42.297284 C158.284896,40.892676 146.228147,40.0867832 133.353789,40.0867832 C120.190372,40.0867832 107.88169,40.9292706 97.3896338,42.392803 C97.2315704,39.3922173 96.8778294,36.6175705 96.3431783,34.1074375 C78.6498638,45.9463781 67,66.1127033 67,89 L67,89 L67,109.777572 Z'
+              id='Shadow'
+              fillOpacity='0.16'
+              fill='#000000'
+              fillRule='evenodd'
+            />
+            <g
+              id='Hair'
+              strokeWidth='1'
+              fill='none'
+              fillRule='evenodd'
+              transform='translate(17.000000, 0.000000)'>
+              <mask id={mask2} fill='white'>
+                <use xlinkHref={'#' + path2} />
+              </mask>
+              <use fill='#314756' xlinkHref={'#' + path2} />
+              <HairColor maskID={mask2} />
+            </g>
+            <FacialHair />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairFroBand.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairFroBand.tsx
new file mode 100644
index 000000000..e0591af14
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairFroBand.tsx
@@ -0,0 +1,56 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class LongHairFroBand extends React.Component {
+  static optionValue = 'LongHairFroBand'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M80.0203173,73.8104172 C78.0626651,79.5136273 77,85.6327143 77,92 L77,92 L77,98.1659169 C71.3245733,99.1180731 67,104.054007 67,110 L67,123 C67,129.018625 71.4308707,134.002364 77.2085808,134.867187 C78.9518066,155.114792 91.4692178,172.282984 109,180.610951 L109,191.55498 C104.295298,193.764912 99.0418843,195 93.5,195 C84.6936661,195 76.615743,191.881303 70.3104439,186.688122 C68.4019201,186.894245 66.4633102,187 64.5,187 C43.405572,187 25.1625605,174.791635 16.4510993,157.055039 C8.9342791,151.923647 4,143.288055 4,133.5 C4,131.385405 4.23029535,129.324599 4.66717333,127.341294 C2.29639351,121.011656 1,114.157223 1,107 C1,94.2436789 5.11811695,82.4491956 12.0974246,72.8734763 C12.0329017,72.0908558 12,71.2992702 12,70.5 C12,59.2025056 18.5734777,49.4403292 28.1042855,44.8296184 C36.5367477,26.7016558 54.5576512,13.9359054 75.6500672,13.049296 C80.7818839,8.06730831 87.7827378,5 95.5,5 C97.8269611,5 100.088787,5.27887473 102.253881,5.80502563 C111.775927,2.05800249 122.147627,0 133,0 C143.346018,0 153.255173,1.87043661 162.407758,5.29160393 C163.744126,5.09944416 165.11045,5 166.5,5 C174.217262,5 181.218116,8.06730831 186.349933,13.049296 C207.442349,13.9359054 225.463252,26.7016558 233.895715,44.8296184 C243.426522,49.4403292 250,59.2025056 250,70.5 C250,71.2992702 249.967098,72.0908558 249.902575,72.8734763 C256.881883,82.4491956 261,94.2436789 261,107 C261,114.157223 259.703606,121.011656 257.332827,127.341294 C257.769705,129.324599 258,131.385405 258,133.5 C258,143.288055 253.065721,151.923647 245.548901,157.055039 C236.837439,174.791635 218.594428,187 197.5,187 C195.53669,187 193.59808,186.894245 191.689556,186.688122 C185.384257,191.881303 177.306334,195 168.5,195 C164.481965,195 160.61557,194.350752 157,193.151442 L157,180.610951 C174.530782,172.282984 187.048193,155.114792 188.791419,134.867187 C194.569129,134.002364 199,129.018625 199,123 L199,110 C199,104.054007 194.675427,99.1180731 189,98.1659169 L189,92 C189,86.5585666 188.223906,81.2983998 186.776371,76.3241528 L188.153157,89.1947292 L176.812614,65.1945789 L131.676809,45.6707349 L101.563146,56.2283606 L80.0648273,76.419385 L80.0203173,73.8104172 Z'
+            id={path2}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Long-Hair/Fro-+-Band' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <mask id={mask2} fill='white'>
+              <use xlinkHref={'#' + path2} />
+            </mask>
+            <use
+              id='Hair'
+              stroke='none'
+              fill='#314756'
+              fillRule='evenodd'
+              xlinkHref={'#' + path2}
+            />
+            <HairColor maskID={mask2} />
+            <path
+              d='M76.6313898,98.975 C76.2155465,96.423245 76,93.8109442 76,91.1521739 C76,62.3493236 101.295912,39 132.5,39 C163.704088,39 189,62.3493236 189,91.1521739 C189,93.8109442 188.784453,96.423245 188.36861,98.975 C184.279562,73.883217 160.823662,54.6456522 132.5,54.6456522 C104.176338,54.6456522 80.7204382,73.883217 76.6313898,98.975 Z'
+              id='Band'
+              stroke='none'
+              fill='#92D9FF'
+              fillRule='evenodd'
+            />
+            <FacialHair />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairMiaWallace.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairMiaWallace.tsx
new file mode 100644
index 000000000..84f8018cc
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairMiaWallace.tsx
@@ -0,0 +1,57 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class LongHairMiaWallace extends React.Component {
+  static optionValue = 'LongHairMiaWallace'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M148.859344,69 C148.952588,70.3212062 149,71.6550662 149,73 L149,111 C149,133.339168 135.919579,152.623239 117,161.610951 L117,170.317435 C135.145605,171.815797 152.721153,174.335027 163.000169,177 C172.952646,163.439362 185.884594,150.800081 186.000169,126 C186.085192,107.014914 158.324059,30.4276364 146.000169,15 C137.861928,4.81215989 117.30504,1.44935656 93.0001685,1 C68.6952966,0.550643437 48.9231015,6.50878211 41,16 C30.3189583,28.7950013 -0.0850232975,107.014914 4.92293245e-13,126 C0.115574613,150.800081 13.047523,163.439362 23,177 C33.2789946,174.335033 50.8544902,171.815807 69,170.317444 L69,161.610951 C50.0804213,152.623239 37,133.339168 37,111 L37,73 L37,73 C37,71.6550662 37.0474121,70.3212062 37.1406562,69 L65.3735517,69 L69.2529753,47.5561285 L72.058097,69 L148.859344,69 Z'
+            id={path2}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Long-Hair/Mia-Wallace' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <path
+              d='M69.0330562,76.212888 C81.9708809,43.1292208 95.6458945,26.5873873 110.058097,26.5873873 C110.596882,26.5873873 139.311316,26.3494141 158.112657,26.226792 C178.767149,35.5853581 193,55.3036503 193,78.114622 L193,93 L110.058097,93 L107.252975,69.820435 L103.373552,93 L69,93 L69,78.114622 C69,77.478246 69.0110772,76.844277 69.0330621,76.2128728 L69.0330562,76.212888 Z'
+              id='Shadow'
+              fillOpacity='0.16'
+              fill='#000000'
+              fillRule='evenodd'
+            />
+            <g
+              id='Hair'
+              strokeWidth='1'
+              fill='none'
+              fillRule='evenodd'
+              transform='translate(40.000000, 19.000000)'>
+              <mask id={mask2} fill='white'>
+                <use xlinkHref={'#' + path2} />
+              </mask>
+              <use id='Combined-Shape' fill='#E6E6E6' xlinkHref={'#' + path2} />
+              <HairColor maskID={mask2} />
+            </g>
+            <FacialHair />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairNotTooLong.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairNotTooLong.tsx
new file mode 100644
index 000000000..8b2652560
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairNotTooLong.tsx
@@ -0,0 +1,58 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class LongHairNotTooLong extends React.Component {
+  static optionValue = 'LongHairNotTooLong'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M59,102.340285 C59,118.921045 59,145.474283 59,182 C59,186.418278 62.581722,190 67,190 L109,190 L109,180.610951 C91.4692178,172.282984 78.9518066,155.114792 77.2085808,134.867187 C71.4308707,134.002364 67,129.018625 67,123 L67,110 C67,106.509412 68.4903619,103.366917 70.8694649,101.174135 C82.4088376,98.5552525 94.9706808,93.6376395 107.341516,86.4953343 C119.473269,79.4910638 129.843979,71.2579416 137.820938,62.752196 C134.394107,70.6604321 130.244513,77.5880409 125.372156,83.5350224 C138.047336,78.0120855 146.677812,69.1324394 151.263585,56.8960843 C151.64142,57.8180234 152.034942,58.738913 152.444252,59.6582378 C162.699828,82.6926393 180.317578,99.018563 198.205873,104.403108 C198.718861,106.513486 199,108.48395 199,110 L199,123 C199,129.018625 194.569129,134.002364 188.791419,134.867187 C187.048193,155.114792 174.530782,172.282984 157,180.610951 L157,190 L175,190 C192.673112,190 207,175.673112 207,158 C207,133.944314 207,115.902549 207,103.874706 C207,103.807916 206.990567,103.721208 206.971823,103.615272 C206.82774,91.3536714 206.623862,84.2237818 206.360189,82.2256031 C201.576875,45.9764505 170.555563,18 133,18 C96.9151011,18 66.8627142,43.8282542 60,78 C54.4771525,78 50,83.5964406 50,90.5 C50,95.0507583 51.6949619,99.1431718 54.8534901,101.273154 C55.7582038,101.883256 57.323834,102.197638 58.9999994,102.340287 Z'
+            id={path2}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Long-Hair/Long-but-not-too-long' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <g id='Behind' strokeWidth='1' fillRule='evenodd'>
+              <mask id={mask2} fill='white'>
+                <use xlinkHref={'#' + path2} />
+              </mask>
+              <use id='Combined-Shape' fill='#944F23' xlinkHref={'#' + path2} />
+              <HairColor maskID={mask2} />
+            </g>
+            <g
+              id='Top'
+              opacity='0.439990942'
+              strokeWidth='1'
+              fillRule='evenodd'
+              transform='translate(50.000000, 18.000000)'
+              fillOpacity='0.159999996'>
+              <path
+                d='M11.8989604,84.7749122 C25.7109099,83.0145308 41.6792969,77.5379209 57.3415164,68.4953343 C69.4732686,61.4910638 79.8439791,53.2579416 87.8209384,44.752196 C84.3941075,52.6604321 80.2445133,59.5880409 75.3721558,65.5350224 C88.0473359,60.0120855 96.6778122,51.1324394 101.263585,38.8960843 C101.64142,39.8180234 102.034942,40.738913 102.444252,41.6582378 C114.38223,68.4713761 136.296003,86.1944823 157,88.1510343 L157,88.1510343 L157,74 C157,33.1309285 123.869071,-7.50752664e-15 83,0 C46.9151011,6.62868839e-15 16.8627142,25.8282542 10.3212729,60.0063288 C10.214595,60.0021202 10.1074956,60 10,60 C4.4771525,60 0,65.5964406 0,72.5 C0,78.9816827 3.9466744,84.3111215 8.99999442,84.9382803 L8.99999434,85.0927525 C9.31629342,85.0638362 9.63387297,85.0328725 9.95270131,84.9998631 C9.96845895,84.9999543 9.98422521,85 10,85 C10.6492988,85 11.2841443,84.9226474 11.8989604,84.7749122 Z'
+                id='Combined-Shape'
+                fill='#FFFFFF'
+              />
+            </g>
+            <FacialHair />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairShavedSides.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairShavedSides.tsx
new file mode 100644
index 000000000..82378ecce
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairShavedSides.tsx
@@ -0,0 +1,86 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+
+export default class LongHairShavedSides extends React.Component {
+  static optionValue = 'LongHairShavedSides'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private mask3 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private path3 = uniqueId('react-path-')
+  private path4 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, mask3, path1, path2, path3, path4 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path2} x='0' y='0' width='264' height='280' />
+          <path
+            d='M156,180.610951 C173.530782,172.282984 186.048193,155.114792 187.791419,134.867187 C193.569129,134.002364 198,129.018625 198,123 L198,110 C198,104.054007 193.675427,99.1180731 188,98.1659169 L188,92 C188,61.072054 162.927946,36 132,36 C101.072054,36 76,61.072054 76,92 L76,92 L76,98.1659169 C70.3245733,99.1180731 66,104.054007 66,110 L66,123 C66,129.018625 70.4308707,134.002364 76.2085808,134.867187 C77.9518066,155.114792 90.4692178,172.282984 108,180.610951 L108,199 L104,199 L104,199 C64.235498,199 32,231.235498 32,271 L32,280 L232,280 L232,271 C232,231.235498 199.764502,199 160,199 L156,199 L156,180.610951 Z M0,5.68434189e-14 L264,5.68434189e-14 L264,280 L0,280 L0,5.68434189e-14 Z'
+            id={path3}
+          />
+          <rect id={path4} x='0' y='0' width='112' height='150' rx='56' />
+          <path
+            d='M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask2} fill='white'>
+          <use xlinkHref={'#' + path2} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Long-Hair/Shaved-Sides' mask={`url(#${mask2})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <g
+              id='Behind'
+              strokeWidth='1'
+              fill='none'
+              fillRule='evenodd'
+              transform='translate(1.000000, 0.000000)'>
+              <mask id={mask3} fill='white'>
+                <use xlinkHref={'#' + path3} />
+              </mask>
+              <g id='Mask-Hair' />
+              <path
+                d='M116.179148,40 L146,40 C171.405098,40 192,60.5949015 192,86 L192,154.108712 C192,180.650314 210.758775,204.349179 222.609956,226.05167 C234.461138,247.754161 215.254522,268.242596 195.770735,276.769484 C190.902336,278.900091 185.645645,280 180.331438,280 L135.26309,280 C78.9108161,280 70.2166412,216.309596 67.6972794,146.504423 L70.2166412,84.1431398 C71.212998,59.4805095 91.4964003,40 116.179148,40 Z'
+                id='Hair'
+                fill='#CCB55A'
+                mask={`url(#${mask3})`}
+              />
+            </g>
+            <g
+              id='Top'
+              strokeWidth='1'
+              fill='none'
+              fillRule='evenodd'
+              transform='translate(77.000000, 36.000000)'>
+              <mask id={mask1} fill='white'>
+                <use xlinkHref={'#' + path4} />
+              </mask>
+              <g id='Mask' />
+              <path
+                d='M98.8014742,19.9396383 C107.026909,29.4843994 112,41.9114359 112,55.5 L112,65.5 L112,61.5 C112,45.7605792 105.327989,31.5794902 94.657974,21.6307409 C63.9198041,32.6768506 38.0141969,32.8027026 16.9411526,22.0082968 C6.50516181,31.936614 -1.90326939e-15,45.958626 0,61.5 L0,61.5 L0,65.5 L0,55.5 C-1.66642407e-15,41.8926148 4.98687681,29.4499771 13.2327229,19.8999944 C9.3991564,16.860899 8.25944611,8.18718262 19.4671989,4.87682391 C31.3115751,1.37843003 29.3063159,-13.2020165 47.4575903,-15.9260752 C65.6088648,-18.6501339 63.9714902,-11.3745857 81.028596,-12.3495122 C98.0857017,-13.3244386 103.635746,-29.1131795 106.849606,-25.0739991 C119.588767,-9.06341321 116.420993,9.34036319 98.8014742,19.9396383 Z'
+                id='Shadow'
+                fillOpacity='0.16'
+                fill='#000000'
+                mask={`url(#${mask1})`}
+              />
+            </g>
+            <path
+              d='M90.8779151,52.3613196 C113.02785,65.2272934 140.816672,65.2272934 174.244382,52.3613196 C188.77455,44.5891967 199.330608,29.0424257 182.951044,8.96303524 C180.782417,6.30455678 172.244382,15.6755614 155.351199,16.6504878 C138.458015,17.6254143 142.079654,13.3498661 124.102817,16.0739248 C106.12598,18.7979835 108.111968,33.37843 96.3814191,36.8768239 C84.6508698,40.3752178 86.5778198,49.8635735 90.8779151,52.3613196 Z'
+              id='Copetón'
+              fill='#E0C863'
+              fillRule='evenodd'
+            />
+            <FacialHair />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairStraight.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairStraight.tsx
new file mode 100644
index 000000000..84bf5f638
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairStraight.tsx
@@ -0,0 +1,57 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class LongHairStraight extends React.Component {
+  static optionValue = 'LongHairStraight'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M133.506381,81.3351151 C137.363649,83.3307002 140,87.3574737 140,92 L140,105 C140,111.018625 135.569129,116.002364 129.791419,116.867187 C128.048193,137.114792 115.530782,154.282984 98,162.610951 L98,162.610951 L98,181 L102,181 C119.490913,181 135.525121,187.236892 148,197.608051 L148,74 C148,53.5654643 139.717268,35.0654643 126.325902,21.6740982 C112.934536,8.28273213 94.4345357,-3.55271368e-15 74,0 C33.1309285,7.10542736e-15 -7.10542736e-15,33.1309285 0,74 L0,257.716445 C13.5691766,255.775526 24,244.105888 24,230 L24,184.423101 C30.9346808,182.200199 38.3271796,181 46,181 L50,181 L50,162.610951 C38.7726252,157.277407 29.6015372,148.317951 24,137.245847 L24,75.2659587 C33.1467898,72.2910056 42.777598,68.0170651 52.3415164,62.4953343 C67.7445474,53.6023901 80.4313947,42.9409152 89.0661426,32.3970356 C90.8310687,37.5951441 93.1752556,42.8009742 96.1104311,47.8848473 C104.877881,63.0705152 117.224186,74.2337047 130,79.9170491 L130,80.1659169 C130.400422,80.233095 130.794121,80.3201038 131.18005,80.4258987 C131.954509,80.7493055 132.730185,81.0524853 133.506381,81.3351151 Z'
+            id={path2}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Long-Hair/Straight' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <g
+              id='Hair'
+              strokeWidth='1'
+              fill='none'
+              fillRule='evenodd'
+              transform='translate(59.000000, 18.000000)'>
+              <mask id={mask2} fill='white'>
+                <use xlinkHref={'#' + path2} />
+              </mask>
+              <use id='Mask-Hair' fill='#944F23' xlinkHref={'#' + path2} />
+              <HairColor maskID={mask2} />
+            </g>
+            <path
+              d='M192.506381,99.3351151 C197.3745,101.107702 202.263079,102.071957 207,102.148232 L207,102.148232 L207,92 C207,71.5654643 198.717268,53.0654643 185.325902,39.6740982 C198.717268,53.0654643 207,71.5654643 207,92 L207,215.608051 C194.525121,205.236892 178.490913,199 161,199 L157,199 L157,180.610951 L157,180.610951 C174.530782,172.282984 187.048193,155.114792 188.791419,134.867187 C194.569129,134.002364 199,129.018625 199,123 L199,110 C199,105.357474 196.363649,101.3307 192.506381,99.3351151 Z M190.18005,98.4258987 C189.794121,98.3201038 189.400422,98.233095 189,98.1659169 L189,97.9170491 C189.392974,98.0918644 189.786355,98.2614951 190.18005,98.4258987 Z M83,155.245847 C88.6015372,166.317951 97.7726252,175.277407 109,180.610951 L109,199 L105,199 C97.3271796,199 89.9346808,200.200199 83,202.423101 L83,155.245847 Z'
+              id='Shadow'
+              fillOpacity='0.24'
+              fill='#000000'
+              fillRule='evenodd'
+            />
+            <FacialHair />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairStraight2.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairStraight2.tsx
new file mode 100644
index 000000000..d7eb2f73f
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairStraight2.tsx
@@ -0,0 +1,62 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class LongHairStraight2 extends React.Component {
+  static optionValue = 'LongHairStraight2'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private path3 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, path1, path2, path3 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M21,157.540812 L21,69.046252 C21,65.5140485 21.3981158,62.0748299 22.1519234,58.7710202 C25.205041,38.7314193 36.7752683,22.8108863 50,13 C69.9046441,-1.75961713 103.441939,-6.01828252 115.047069,11.5221046 C123.698343,7.68103538 136.519049,11.1821114 146,20 C155.565156,29.4150438 163.19967,50.1973768 158.657409,67.2035172 C158.762104,68.4691962 158.815476,69.7490355 158.815476,71.0408963 L158.815476,92.8921195 C157.934142,87.9183006 153.988995,84.0029116 149,83.1659169 L149,83 C142.963851,61.4642087 125.229516,51.5800472 114.429684,41.777113 C97.5353566,60.6732583 44.8226408,60.7398069 27,98 L27,108 C27,114.018625 31.4308707,119.002364 37.2085808,119.867187 C38.9518066,140.114792 51.4692178,157.282984 69,165.610951 L69,166 C71.9303712,209.855112 62.358462,264.797432 0,248 C13.6057325,240.037752 20.8081123,189.055563 21,157.540812 Z M117,165.610951 C134.530782,157.282984 147.048193,140.114792 148.791419,119.867187 C153.87876,119.105701 157.921895,115.150816 158.815476,110.107881 L158.815476,111.47039 L158.815476,111.47039 C158.815476,127.298552 162.572711,142.900645 169.7782,156.993609 L196.726668,209.701177 C203.689761,223.320048 201.645562,239.173573 192.790715,250.468968 C189.966212,213.288807 158.90349,184 121,184 L121,184 L117,184 L117,165.610951 Z'
+            id={path2}
+          />
+          <path
+            d='M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z'
+            id={path3}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Long-Hair/Straight' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <g
+              id='Hair'
+              strokeWidth='1'
+              fill='none'
+              fillRule='evenodd'
+              transform='translate(40.000000, 15.000000)'>
+              <mask id={mask2} fill='white'>
+                <use xlinkHref={'#' + path2} />
+              </mask>
+              <use fill='#272C2E' xlinkHref={'#' + path2} />
+              <HairColor maskID={mask2} />
+            </g>
+            <path
+              d='M67,113 C84.8226408,80.6646674 137.535357,80.6069148 154.429684,64.2083647 C165.207546,72.6982916 182.891727,79.2665518 188.963018,97.8687161 C182.891727,76.423995 165.207546,66.5601054 154.429684,56.777113 C137.535357,75.6732583 84.8226408,75.7398069 67,113 Z'
+              id='Shadow'
+              fillOpacity='0.16'
+              fill='#000000'
+              fillRule='evenodd'
+            />
+            <FacialHair />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairStraightStrand.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairStraightStrand.tsx
new file mode 100644
index 000000000..38a426d52
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/LongHairStraightStrand.tsx
@@ -0,0 +1,62 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class LongHairStraightStrand extends React.Component {
+  static optionValue = 'LongHairStraightStrand'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private path3 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, path1, path2, path3 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M8.46130289,88.6935361 C8.16088005,89.7438903 8,90.8531574 8,92 L8,105 C8,111.018625 12.4308707,116.002364 18.2085808,116.867187 C19.9518066,137.114792 32.4692178,154.282984 50,162.610951 L50,181 L46,181 L46,181 C30.3810228,181 15.9236322,185.973344 4.12503673,194.422823 C1.45272918,186.776619 1.52589027e-14,178.557961 1.42108547e-14,170 L0,74 L0,74 C-5.00501776e-15,33.1309285 33.1309285,7.50752664e-15 74,0 L74,0 L74,0 C114.869071,-7.50752664e-15 148,33.1309285 148,74 L148,170 C148,178.557961 146.547271,186.776619 143.874963,194.422823 C132.076368,185.973344 117.618977,181 102,181 L102,181 L98,181 L98,162.610951 C115.530782,154.282984 128.048193,137.114792 129.791419,116.867187 C135.569129,116.002364 140,111.018625 140,105 L140,92 C140,90.3107559 139.650957,88.7030352 139.021057,87.2450254 C126.064756,85.0568849 111.478699,79.7686298 97.1489304,71.4953343 C85.0171781,64.4910638 74.6464677,56.2579416 66.6695083,47.752196 C70.0963393,55.6604321 74.2459335,62.5880409 79.118291,68.5350224 C66.4431108,63.0120855 57.8126345,54.1324394 53.2268621,41.8960843 C52.8490267,42.8180234 52.455505,43.738913 52.0461952,44.6582378 C42.206947,66.7575512 25.5911314,82.6819966 8.46130289,88.6935361 Z'
+            id={path2}
+          />
+          <path
+            d='M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z'
+            id={path3}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Long-Hair/Straight-+-Strand' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <g
+              id='Hair'
+              strokeWidth='1'
+              fill='none'
+              fillRule='evenodd'
+              transform='translate(59.000000, 18.000000)'>
+              <mask id={mask2} fill='white'>
+                <use xlinkHref={'#' + path2} />
+              </mask>
+              <use fill='#ECC797' xlinkHref={'#' + path2} />
+              <HairColor maskID={mask2} />
+            </g>
+            <path
+              d='M59,102.418954 L59,108.837908 C78.9453743,105.750496 99.5895621,88.3902571 111.046195,62.6582378 C111.455505,61.738913 111.849027,60.8180234 112.226862,59.8960843 C116.231662,70.5822127 123.321236,78.70828 133.495584,84.2742862 C134.956498,86.4697241 136.497401,88.5566361 138.118291,90.5350224 C125.443111,85.0120855 116.812635,76.1324394 112.226862,63.8960843 C111.849027,64.8180234 111.455505,65.738913 111.046195,66.6582378 C99.5895621,92.3902571 78.9453743,109.750496 59,112.837908 L59,102.418954 Z M207,101.140388 L207,110.280776 C192.046922,109.412723 173.901259,103.744646 156.14893,93.4953343 C145.87623,87.5643877 136.866205,80.7523483 129.502994,73.639773 C128.137922,71.1289501 126.860094,68.4997578 125.669508,65.752196 C133.646468,74.2579416 144.017178,82.4910638 156.14893,89.4953343 C173.901259,99.7446457 192.046922,105.412723 207,106.280776 L207,101.140388 Z'
+              id='Shadow'
+              fillOpacity='0.16'
+              fill='#000000'
+              fillRule='evenodd'
+            />
+            <FacialHair />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/NoHair.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/NoHair.tsx
new file mode 100644
index 000000000..8374ce346
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/NoHair.tsx
@@ -0,0 +1,57 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+
+export default class NoHair extends React.Component {
+  static optionValue = 'NoHair'
+
+  private filter1 = uniqueId('react-filter-')
+  private mask1 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+
+  render () {
+    const { filter1, mask1, path1 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <filter
+            x='-0.8%'
+            y='-2.0%'
+            width='101.5%'
+            height='108.0%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/No-Hair' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <FacialHair />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairDreads01.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairDreads01.tsx
new file mode 100644
index 000000000..98594506b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairDreads01.tsx
@@ -0,0 +1,58 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class ShortHairDreads01 extends React.Component {
+  static optionValue = 'ShortHairDreads01'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private path3 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, path1, path2, path3 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z'
+            id={path2}
+          />
+          <path
+            d='M185.831676,73.928751 C187.588868,74.9173665 188.980206,84.8279256 189.047535,88.6176558 C189.08965,90.9562115 189.127358,99.8740101 186.654049,99.1031293 C185.901013,98.868423 184.751682,94.1472484 184.58821,91.3840965 C184.424737,88.6209446 182.855069,79.2200034 180.446757,74.8947261 C179.896491,73.9063366 178.320781,72.1708928 179.001547,71.3348066 C179.846064,70.2980597 180.666198,70.8995898 181.697184,71.3146953 C182.8124,71.7641482 185.6344,73.8180261 185.831676,73.928751 Z M186.636742,70.9565876 C185.890663,71.9188016 180.795829,69.217693 178.671174,68.0439722 C160.825581,58.1840558 157.361562,55.0486831 129.245707,55.4578453 C101.129853,55.8670074 81.8674779,69.0400225 80.7839818,70.3874406 C80.0301584,71.3248831 79.0677773,73.8279219 78.2764086,80.8005402 C77.48504,87.7731584 78.4952061,100.277789 75.6304859,100.262618 C73.1915094,100.249702 72.6608912,76.4770353 73.7137309,67.0463924 C73.8753757,65.5984852 74.4983655,63.0083957 74.0474223,61.7058802 C73.6532986,60.5682485 71.7253768,60.5705662 72.0331217,58.6750651 C72.3829065,56.5173393 74.5584694,57.5890837 75.5060085,56.5574014 C77.3005851,54.602966 74.5321945,54.1404306 74.0730403,52.4306721 C73.3905494,49.8892108 75.3628102,49.2336489 77.1396512,48.4310821 C79.1060001,47.5437559 78.8504766,48.3231462 80.4463492,46.5849138 C78.3147968,45.0224912 77.543628,42.8939014 80.4624425,41.7519655 C81.7019616,41.2669159 84.9268789,41.9089031 85.8980654,41.1801698 C86.1512899,40.9901231 86.251463,39.9008308 86.4074703,39.6780059 C87.9583471,37.4593592 87.5757186,35.8532324 87.4183976,33.3624282 C87.2889936,31.3242265 87.3064008,29.4532263 89.7466834,29.2496048 C91.3750712,29.1138571 92.6993269,30.4441843 94.1582415,30.835866 C95.7767762,31.2705896 95.1688403,31.5877757 96.4369334,30.7150174 C98.6630755,29.1817309 97.1479982,26.1942888 98.913344,24.4120212 C101.335891,21.9662454 102.923881,25.5513084 104.868882,25.8218105 C109.09126,26.4101607 107.736132,22.1218586 110.235861,20.5504965 C113.223647,18.6738677 113.512672,22.8012592 115.378847,22.948264 C116.996068,23.0750722 119.907657,19.9545311 121.317306,19.3731338 C125.499944,17.6471518 127.572378,22.5039387 131.554013,21.8844657 C134.443268,21.434843 135.223305,21.067662 137.830761,22.7115333 C140.361692,24.3070651 140.96306,23.1664535 143.828996,23.1436082 C145.853806,23.128378 147.093982,24.8202575 148.787729,24.9967295 C149.632467,25.085131 150.441078,24.2050888 151.347562,24.2603811 C154.58496,24.4567186 154.789576,28.6430444 157.361562,29.7955753 C159.711524,30.8487786 162.474332,29.3691289 164.806559,29.0953159 C170.497048,28.4275036 166.60015,33.7425217 166.760755,36.914713 C168.994451,37.4358517 171.261648,35.3509661 173.485163,35.7347015 C176.986623,36.3392753 175.664995,39.9680424 174.853429,42.4144804 C177.279589,42.3707762 183.612828,39.6776748 185.184725,43.1220237 C185.995306,44.8980006 184.106797,47.2689496 184.13767,49.0743937 C184.181023,51.615855 186.048513,53.7186196 186.709327,56.1240021 C187.601032,59.3710203 188.871834,68.0740038 186.636742,70.9565876 Z'
+            id={path3}
+          />
+        </defs>
+        <mask id={mask2} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Short-Hair/Dreads-01' mask={`url(#${mask2})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <FacialHair />
+            <g
+              id='Hair'
+              strokeWidth='1'
+              fillRule='evenodd'
+              transform='translate(1.000000, 0.000000)'>
+              <mask id={mask1} fill='white'>
+                <use xlinkHref={'#' + path3} />
+              </mask>
+              <use
+                id='Dreads-With-Cut'
+                fill='#2E3257'
+                xlinkHref={'#' + path3}
+              />
+              <HairColor maskID={mask1} />
+            </g>
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairDreads02.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairDreads02.tsx
new file mode 100644
index 000000000..479603a90
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairDreads02.tsx
@@ -0,0 +1,54 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class ShortHairDreads02 extends React.Component {
+  static optionValue = 'ShortHairDreads02'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private path3 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, path1, path2, path3 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z'
+            id={path2}
+          />
+          <path
+            d='M153.503392,98.8736491 C157.89934,100.654655 161,104.965228 161,110 L161,123 C161,128.28759 157.580126,132.776426 152.8316,134.375285 C151.985668,145.321578 147.992514,155.385777 141.755762,163.66426 C141.964657,164.471736 142.166135,165.290125 142.311896,166.167999 C142.862922,169.494538 142.191903,172.260864 143.956619,175.261034 C144.414366,176.040649 145.140008,176.50834 145.478876,177.405464 C146.012313,178.819858 145.247,181.999219 147.428222,182 C150.534993,182.00039 148.803043,176.034013 148.024863,174.616105 C146.500469,171.843533 145.563369,171.165421 145.642135,167.571852 C147.387236,168.73171 153.172487,170.947581 155.089787,169.887664 C159.522305,167.44029 148.428013,164.951924 147.651918,164.434653 C149.356221,162.768846 151.308063,161.884996 152.848916,159.689035 C154.108583,157.895569 155.254913,155.292428 157.398137,155.187802 C158.584855,155.129634 162.056295,158.072417 163.10825,156.053694 C164.07308,154.203231 161.993578,153.931908 161.181077,153.276828 C159.678802,152.06661 159.340419,153.270972 159.706723,151.14333 C160.792178,152.307873 162.495834,151.571982 162.95061,150.127527 C163.441226,148.569468 161.823998,148.10412 161.853937,147.113692 C161.842192,147.500572 162.687735,141.999153 162.554381,142.176001 C163.413669,141.041128 166.462257,141.392482 167.966582,141.555666 C170.263178,141.804346 170.13091,141.873446 171.222117,143.992109 C172.103838,145.707106 174.419542,149.169502 174.928748,144.633135 C175.050449,143.548232 174.059985,141.228907 173.478827,140.295477 C172.851533,139.287873 170.962455,138.651922 170.567003,137.868403 C169.622984,135.99803 172.731819,131.833707 172.206,129.014288 C173.298856,129.431618 176.063377,135.941423 177.404406,130.612948 C178.111059,127.812658 170.89879,121.667871 173.890225,120.718825 C176.178665,119.993084 178.501504,122.944066 179.140297,124.762907 C179.612624,126.110544 179.400215,129.001405 180.207508,130.116368 C183.243976,134.318949 183.618438,127.375418 183.364612,125.543693 C182.806036,121.517569 181.381252,118.556438 177.742225,117.034295 C179.037272,115.426656 177.396605,114.146948 176.467109,113.140514 C177.994834,111.484467 187.90383,113.244749 185.67495,108.813788 C185.137049,107.742159 183.193837,107.552037 182.208315,107.158911 C179.717195,106.166532 177.22313,104.1482 175.950562,101.597371 C177.79234,101.136708 183.230278,102.394554 182.515816,98.6011044 C181.952817,95.619282 177.112955,96.5335826 175.237767,96.9915137 C176.930155,95.9749301 180.211017,96.8166176 180.67198,94.0499017 C181.203002,90.8666365 177.383839,90.9736042 175.591269,91.6482034 C175.17003,88.2904324 181.122531,85.8176826 182.804663,83.2477249 C183.373237,82.3806618 184.275583,82.0835727 183.551013,80.6153042 C182.244616,77.9719526 178.870779,81.7013778 177.758771,82.7050785 C178.635221,81.0771393 181.079608,74.3018671 180.708517,72.5829664 C180.162561,70.057123 178.355898,69.967723 176.919931,72.0153348 C175.988608,73.3450137 175.729666,76.7176196 175.238294,78.4419859 C173.199533,76.9046179 173.095791,78.6883239 172.991008,76.2507095 C172.923099,74.6707886 174.992708,71.5499862 175.522623,70.0032488 C175.978715,68.6739603 177.190719,66.2433729 176.465593,64.9570277 C174.690293,61.8139729 172.993447,66.1289878 172.525841,67.608968 C171.737261,64.1977131 174.740084,61.5524095 175.629329,58.1778516 C176.170088,56.1298495 177.605245,50.5995409 175.118415,49.6165311 C171.724815,48.2755308 172.918922,54.5725714 172.440664,56.6162793 C172.07606,58.1758997 171.519076,60.6935447 170.302082,61.4622287 C170.125896,61.5734908 167.481496,61.8046035 167.354151,61.6554733 C165.620359,59.6336275 170.392027,55.207741 170.637754,53.3037939 C170.861461,51.5731813 170.198398,50.4792998 168.576831,50.3754553 C167.767833,50.323533 166.456472,51.5751333 166.081721,51.4935411 C164.602506,51.1718572 166.529338,44.4051737 166.669221,42.5269926 C166.819045,40.5238856 166.575417,35.355081 163.186097,37.7423348 C163.413049,35.0454993 163.549887,32.5063826 163.920134,29.8505384 C164.114962,28.45176 165.31836,27.2060156 163.546466,26.0840259 C161.389659,24.7192116 160.195301,27.5757179 159.703512,29.2516754 C158.858129,32.1374612 160.604934,36.6265913 156.546177,36.7183337 C151.880955,36.8237399 155.102123,31.9875502 155.331481,28.8503513 C155.459059,27.1091981 154.318536,22.4287754 152.06891,25.5866651 C151.173373,26.8456828 151.481865,31.2813291 150.985494,32.7702884 C149.878539,32.2772219 151.717562,28.2546115 150.755804,27.2056252 C148.695236,24.958913 146.966535,28.2315783 145.655991,28.8975889 C145.57044,27.4527441 145.468923,26.0067281 145.407913,24.5603216 C145.315305,22.3600662 146.663012,17.7307849 145.2945,16.2125461 C142.95772,13.6238495 141.471891,16.6443209 140.789049,18.7364375 C140.175628,20.6196938 140.091904,22.4795265 137.555716,22.7360147 C137.763741,20.0192692 135.29832,14.3004008 136.520803,12.0087933 C137.073558,10.9742516 138.200031,11.7078002 138.699701,10.5498943 C139.521287,8.64672801 138.176249,7.83939509 136.714154,7.77771298 C129.921887,7.49233563 135.152043,16.9117402 132.745372,19.2693241 C131.646423,18.2285361 132.817064,17.1557359 131.680174,15.6730229 C130.456777,14.0782671 128.507084,14.2133431 126.762486,14.9351799 C126.706116,13.3220757 129.125524,2.01512054 123.682122,7.11833905 C122.329503,8.38945896 122.708203,10.5112454 121.988704,12.004499 C121.293397,13.448563 119.599928,15.6019713 118.647561,16.7751026 C118.138071,14.7079712 118.919891,12.1450405 119.467423,10.1091405 C119.848493,8.69357518 122.399415,4.30399525 121.855094,2.8653967 C120.275192,-1.30204956 115.532497,5.5840942 114.282756,6.69671451 C112.701004,8.10642397 106.402711,12.7415612 104.381766,11.3369268 C103.680648,10.8501066 104.312204,9.04610014 103.355021,8.20948774 C102.885296,7.799575 100.877713,7.60828238 100.304676,7.66059506 C100.663044,6.16656069 99.9590183,4.23411488 98.2500992,4.75060494 C96.1010516,5.40060944 97.031157,8.58855944 95.6691727,9.75271164 C93.1402627,11.9174413 90.1353523,7.6410754 87.4245062,7.76092608 C87.8388134,6.00571874 90.9097688,-0.301081675 86.0261697,1.61691959 C84.7804466,2.10647253 83.8958015,4.9680539 83.5854252,6.15758165 C82.7941498,9.19327834 83.364323,9.74958849 80.0771587,10.6065013 C80.3338947,8.84621888 79.876509,6.65923677 80.7256589,5.08595261 C81.4218191,3.79726501 85.0314735,0.441445987 81.1879964,0.0233349851 C76.4475113,-0.492764683 76.9137424,7.69455926 76.3331882,10.4628367 C72.1267344,7.91396017 69.3589223,11.5606221 66.8533479,14.7153886 C67.3001674,13.2963097 68.4061862,-0.841776108 63.8882057,3.47753307 C62.5963925,4.71468878 64.0256621,6.54407081 63.9388761,7.95573223 C63.8604755,9.23622158 63.4388415,10.377731 62.9428241,11.5742858 C62.1474037,13.4950198 61.2224184,15.460649 59.9693808,17.0979577 C58.3962141,19.1568908 58.9543722,19.318904 57.1484939,17.9212967 C54.7243438,16.0478003 53.5723002,11.2974971 53.6920659,8.39570525 C53.781581,6.23526987 54.8879763,1.84842269 51.3078111,2.86461591 C47.8009276,3.86128948 49.6590375,10.8387852 50.0116201,13.3177814 C50.3931233,16.0052474 50.6468605,18.7543956 50.1948883,21.4906608 C47.2109167,18.4409099 46.7758614,24.7926055 46.1779169,25.8763368 C45.1988562,27.6534061 43.310101,28.5232019 41.8428337,29.7357629 C41.0431153,26.9417195 44.2482173,24.5790605 43.6123112,22.3561622 C42.4186453,18.1910583 39.0417626,24.0719399 38.2998862,25.2263323 C37.6814572,26.1886512 35.6651905,31.6682087 34.9351609,32.1593232 C33.9115906,32.848367 27.3301947,29.6315279 26.6642795,29.0186108 C25.4417603,27.8938883 25.8867201,24.7465391 24.3487748,24.0297774 C19.6293173,21.8322547 22.4173261,29.7638712 23.3441752,31.4035222 C25.7628153,35.687696 26.8597232,40.8604044 26.2928172,45.9077967 C25.4350389,45.6056325 24.378271,44.5964663 23.8253733,43.8305151 C22.7491426,42.3411654 23.1404237,39.9656235 22.017351,38.8436337 C18.7294809,35.5639414 18.3438318,41.7216116 18.6111593,43.6353185 C19.1118632,47.2226407 20.9020846,48.3856217 22.3890054,51.3693961 C23.7571524,54.1197154 21.943774,57.4376663 21.5613192,60.4944442 C18.1321771,57.1944514 3.36588279,59.9510171 7.16521769,64.996067 C9.14262534,67.628878 11.4834592,62.6185731 13.763287,62.7450604 C17.8464603,62.9714884 19.9981829,68.0411331 19.730271,71.5921487 C19.2330959,69.6940575 17.308498,67.8307112 15.9842104,70.148475 C15.0865685,71.7213688 16.6185854,74.4088349 17.3583008,75.9707976 C16.4523462,75.5265303 11.9860935,73.4504198 11.1123314,73.8095815 C7.67255627,75.2239756 12.4125819,77.9610216 13.6493116,78.5079623 C17.8734551,80.3759933 20.5363542,82.427509 21.8496116,87.4998864 C19.4819334,86.7425238 19.8941915,85.6220957 18.2972545,84.4567723 C16.830792,83.3870952 16.5566308,83.9387206 15.2071591,83.5889284 C12.8451619,82.9775728 9.76564295,82.1620417 7.09694168,83.2707581 C5.12707484,84.0898028 1.809527,86.5809011 1.19123199,88.9213077 C0.433581882,91.7946008 2.03522104,92.5273687 4.0949367,91.063785 C6.54565844,89.3249741 6.99233616,85.9593953 10.6783285,86.1030599 C12.4468385,86.1721595 14.198865,87.0989527 15.3182307,88.4286316 C16.1532654,89.4217916 16.6409799,90.859219 17.4378821,91.9242113 C18.1406712,92.8638875 20.0019971,94.1826354 20.3954288,95.1781378 C21.8129983,98.7732678 19.1191629,101.97332 17.3124291,104.492136 C16.8931801,103.937778 13.8353612,102.734196 13.2017458,102.613565 C10.2619363,102.05257 9.16499332,103.411918 11.003339,106.125931 C11.5823428,106.981673 12.8005957,107.342006 13.4385893,108.120059 C14.1501828,108.989074 14.5506213,110.319534 15.2570206,111.263504 C16.6502186,113.127241 18.3720966,114.086046 20.0353361,115.585546 C19.4216552,115.995069 19.4893606,114.962089 18.9332619,115.176024 C18.5290809,115.331791 17.8260425,115.020647 17.3157029,115.190078 C16.4875948,115.464915 16.5976214,116.907417 16.0678004,117.11862 C12.7691062,118.433464 9.44069672,113.504361 6.48191847,113.343909 C4.86832034,113.256461 3.50714906,114.33785 4.28187338,116.365942 C4.82030298,117.777604 7.1521321,118.543555 8.31806645,119.133048 C11.5636759,120.776994 14.7956022,122.001266 18.2658233,120.739516 C21.0634173,123.177911 24.4247131,124.380712 27.9404633,124.415457 C25.9286815,125.412912 23.9404919,126.650458 23.2377959,129.136091 C22.0492883,127.906352 19.1297602,122.18397 17.6048295,126.674272 C16.5600021,129.760719 21.328009,133.54519 23.5253695,134.93577 C20.9696368,135.690791 18.8477815,135.842653 16.2480678,135.542832 C14.8906605,135.386674 11.9114372,133.569004 13.0097195,137.290621 C14.1918233,141.306595 21.2508358,139.501808 23.4900552,138.806518 C23.573221,137.609182 12.720439,150.91495 20.3316507,148.295803 C22.5082405,147.54781 22.7169752,143.295258 25.7496614,142.923213 C29.2527527,142.493 29.604919,146.000291 31.6318019,148.569078 C32.6420388,149.851129 37.301235,152.734182 37.0806939,153.833919 C36.8900419,154.785698 34.3317238,155.329905 33.7876434,156.661927 C33.1549566,158.211397 33.4406255,159.407952 34.3203529,160.740363 C35.8579788,163.072962 38.6803216,163.431343 40.9122645,164.344472 C44.0760798,165.639406 45.222862,167.210738 46.6413081,170.561482 C44.1404008,170.681333 37.0221866,177.920783 41.3837473,179.20908 C43.008912,179.689263 42.7562908,178.242857 43.4326768,177.443722 C43.7062927,176.928403 43.9803807,176.413865 44.2542196,175.898937 C44.712395,174.701211 45.2188422,174.627817 45.7732734,175.678365 C45.8972683,175.647914 47.3835007,176.067196 47.7210266,176.087887 C49.4285338,176.192512 50.5714284,174.896017 51.9872076,174.195261 C53.0103456,173.688921 54.0114437,173.77676 54.7822568,172.609485 C54.6931475,172.74417 55.3356677,170.098476 55.3468697,170.07271 C55.6226004,169.435623 56.3317095,169.525891 56.6573761,168.839152 C47.908417,159.753669 42.1996805,147.719969 41.1683996,134.375285 C36.4198742,132.776426 33,128.28759 33,123 L33,110 C33,104.965228 36.1006595,100.654655 40.4966083,98.8736491 C41.0282518,99.2483349 41.7670825,98.8748923 42,98.0318338 C41.5372601,96.526107 45.2959449,70.1780326 55,63.1563695 C58.618222,60.7183684 78.0082164,60.5372207 97.3126144,60.5504522 C116.408606,60.5635409 135.42084,60.7446886 139,63.1563695 C148.704055,70.1780326 152.46274,96.526107 152,98.0318338 C152.232917,98.8748923 152.971748,99.2483349 153.503392,98.8736491 Z'
+            id={path3}
+          />
+        </defs>
+        <mask id={mask2} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Short-Hair/Dreads-02' mask={`url(#${mask2})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <FacialHair />
+            <g
+              id='Hair'
+              strokeWidth='1'
+              fillRule='evenodd'
+              transform='translate(36.000000, 0.000000)'>
+              <mask id={mask1} fill='white'>
+                <use xlinkHref={'#' + path3} />
+              </mask>
+              <use id='Dreads' fill='#2E3257' xlinkHref={'#' + path3} />
+              <HairColor maskID={mask1} />
+            </g>
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairFrizzle.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairFrizzle.tsx
new file mode 100644
index 000000000..fd51a79e8
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairFrizzle.tsx
@@ -0,0 +1,75 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class ShortHairFrizzle extends React.Component {
+  static optionValue = 'ShortHairFrizzle'
+
+  private filter1 = uniqueId('react-filter-')
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { filter1, mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path2} x='0' y='0' width='264' height='280' />
+          <path
+            d='M90.9102919,55.3613196 L175.085702,55.3613196 C193.333279,44.8338001 196.759397,26.1510357 183.849606,9.92600089 C180.635746,5.88682054 175.085702,21.6755614 158.028596,22.6504878 C140.97149,23.6254143 142.608865,16.3498661 124.45759,19.0739248 C106.306316,21.7979835 108.311575,36.37843 96.4671989,39.8768239 C88.5709482,42.2090865 86.7186458,47.370585 90.9102919,55.3613196 Z'
+            id={path1}
+          />
+          <filter
+            x='-0.8%'
+            y='-2.0%'
+            width='101.5%'
+            height='108.0%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+        </defs>
+        <mask id={mask2} fill='white'>
+          <use xlinkHref={'#' + path2} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Short-Hair/Frizzle' mask={`url(#${mask2})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <FacialHair />
+            <mask id={mask1} fill='white'>
+              <use xlinkHref={'#' + path1} />
+            </mask>
+            <use
+              id='Hair-Maks'
+              stroke='none'
+              fill='#252E32'
+              fillRule='evenodd'
+              xlinkHref={'#' + path1}
+            />
+            <HairColor maskID={mask1} />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShaggy.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShaggy.tsx
new file mode 100644
index 000000000..d2b1240c7
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShaggy.tsx
@@ -0,0 +1,77 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class ShortHairShaggy extends React.Component {
+  static optionValue = 'ShortHairShaggy'
+
+  private filter1 = uniqueId('react-filter-')
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { filter1, mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path2} x='0' y='0' width='264' height='280' />
+          <filter
+            x='-0.8%'
+            y='-2.0%'
+            width='101.5%'
+            height='108.0%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+          <path
+            d='M198.74696,37.856181 C193.606255,34.0244119 187.528383,30.7396605 181.187893,29.4782789 C174.741035,28.1960616 170.829392,27.8846292 164.483286,29.4052984 C162.85043,29.796545 162.299428,30.1854765 160.862131,29.2568033 C159.651446,28.4743102 151.200134,19.7668788 125.441738,24.5998777 C99.4069464,29.4847361 91.6728211,68.675365 82.0154166,70.1662691 C78.5349852,70.703365 74.2336661,69.781637 74.0992189,67.6388757 C70.1355043,73.6726057 69.0913088,81.6460323 70.7717335,88.7129442 C72.2186099,94.7989286 75.2686121,100.517478 80.7607964,103.849523 C85.4865987,106.716901 92.0203357,107.966046 97.4817987,107.437218 C99.9669245,107.196782 102.227091,106.673576 104.513684,105.671152 C107.272659,104.461694 109.470722,102.280238 112.177835,101.127995 C109.351471,103.576015 106.275372,105.735312 103.001731,107.546357 C101.362599,108.452872 99.6980301,109.07761 97.8887739,109.570058 C96.6533133,109.906073 94.127556,111.05104 92.9327267,110.752066 C100.740244,112.148383 108.093217,110.931649 115.252282,107.589351 C118.483309,106.08125 121.59079,104.256976 124.44325,102.112561 C127.276221,99.9826977 130.537639,97.8062025 132.753871,95.0036468 C131.823641,96.2071517 133.450882,94.4169423 133.665931,94.1980029 C134.274082,93.578226 134.869349,92.9458816 135.453055,92.302954 C136.455298,91.1993278 137.450603,90.0751967 138.383805,88.9120401 C140.37772,86.426318 142.234875,83.8298033 143.891185,81.1086057 C145.568637,78.352682 152.249704,67.2357231 154.266412,64.6190342 C152.361358,70.327001 150.286511,76.0372828 147.858864,81.5445 C152.572444,80.0744315 157.142657,76.0002417 160.15401,72.2035294 C163.545911,67.9275978 165.554691,62.9359795 166.262273,57.5379012 C170.087576,67.953725 179.047309,76.1675881 188.294435,81.8328914 C186.29094,78.1026546 183.238626,74.9478777 181.242068,71.1548033 C190.433037,80.4838679 205.809898,85.0481908 209.837367,98.7289227 C210.869671,93.9714569 214.189889,90.1482867 215.184533,85.2955724 C216.28885,79.9070851 217.081329,74.1868816 216.90592,68.6796644 C216.508524,56.4379129 208.273882,44.9574883 198.74696,37.856181 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask2} fill='white'>
+          <use xlinkHref={'#' + path2} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Short-Hair/Shaggy' mask={`url(#${mask2})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <FacialHair />
+            {this.props.children}
+            <mask id={mask1} fill='white'>
+              <use xlinkHref={'#' + path1} transform='scale(-1, 1)' />
+            </mask>
+            {/*XXX: some how the mask is broken, fix it later.*/}
+            <use
+              id='Shaggy-Hair'
+              stroke='none'
+              fill='#28354B'
+              fillRule='evenodd'
+              transform='translate(143.465161, 67.234158) scale(-1, 1) translate(-143.465161, -67.234158) '
+              xlinkHref={'#' + path1}
+            />
+            <HairColor maskID={mask1} />
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShaggyMullet.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShaggyMullet.tsx
new file mode 100644
index 000000000..112050717
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShaggyMullet.tsx
@@ -0,0 +1,62 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class ShortHairShaggyMullet extends React.Component {
+  static optionValue = 'ShortHairShaggyMullet'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private path3 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, path1, path2, path3 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M175.126419,166.897818 C175.841424,169.13759 176.874789,171.230601 178.55519,172.685954 C180.17619,174.090053 183.068114,173.745469 185.098621,173.802748 C186.770693,173.850632 188.444623,173.856087 190.114529,173.783655 C190.95366,173.747287 191.327571,174.79771 190.648775,175.281705 C190.518773,175.374442 190.388771,175.462634 190.25846,175.543856 C189.20761,176.198779 188.11838,176.802787 187.008721,177.356184 C184.485135,178.614206 181.821334,179.600077 179.02722,180.090436 C177.110792,180.426519 175.211229,180.489668 173.372596,180.266511 C173.858877,180.986862 174.419563,181.642356 175.071506,182.207788 C176.801481,183.708407 179.887821,183.340135 182.054832,183.401352 C183.839313,183.452528 185.625776,183.458358 187.407944,183.380946 C188.303488,183.342078 188.702535,184.464709 187.978106,184.981974 C187.839364,185.081086 187.700623,185.175341 187.561551,185.262145 C186.440057,185.962089 185.2776,186.607617 184.093342,187.199055 C181.400104,188.543555 178.557223,189.597195 175.57527,190.121262 C170.075488,191.087126 164.705859,189.943766 160.380755,186.413279 C159.16361,185.419765 158.027363,184.287616 157,183.053001 L157,180.610951 C163.949635,177.309539 170.111406,172.618864 175.126419,166.897818 Z M81.3150549,151.593977 C80.572738,153.13892 79.8051751,154.672522 79.0058562,156.190972 C74.2106831,165.300379 68.2421528,176.792949 56.4993303,177.596328 C55.4105393,177.670743 54.9804404,178.942941 55.8287461,179.588187 C66.9485528,188.041497 92.2609618,193.18734 101.273548,191.569729 C104.095212,191.063278 106.638877,190.402091 109,189.610443 L109,180.610951 C96.5625107,174.702544 86.6484598,164.344483 81.3150549,151.593977 Z M195.90592,68.6796644 C196.081329,74.1868816 195.28885,79.9070851 194.184533,85.2955724 C193.189889,90.1482867 189.869671,93.9714569 188.837367,98.7289227 C184.809898,85.0481908 169.433037,80.4838679 160.242068,71.1548033 C162.238626,74.9478777 165.29094,78.1026546 167.294435,81.8328914 C158.047309,76.1675881 149.087576,67.953725 145.262273,57.5379012 C144.554691,62.9359795 142.545911,67.9275978 139.15401,72.2035294 C136.142657,76.0002417 131.572444,80.0744315 126.858864,81.5445 C129.286511,76.0372828 131.361358,70.327001 133.266412,64.6190342 C131.249704,67.2357231 124.568637,78.352682 122.891185,81.1086057 C121.234875,83.8298033 119.37772,86.426318 117.383805,88.9120401 C116.450603,90.0751967 115.455298,91.1993278 114.453055,92.302954 C113.869349,92.9458816 113.274082,93.578226 112.665931,94.1980029 C112.450882,94.4169423 110.823641,96.2071517 111.753871,95.0036468 C109.537639,97.8062025 106.276221,99.9826977 103.44325,102.112561 C100.59079,104.256976 97.4833088,106.08125 94.2522818,107.589351 C87.0932166,110.931649 79.7402436,112.148383 71.9327267,110.752066 C73.127556,111.05104 75.6533133,109.906073 76.8887739,109.570058 C78.6980301,109.07761 80.3625987,108.452872 82.0017312,107.546357 C85.2753717,105.735312 88.3514706,103.576015 91.1778346,101.127995 C88.4707222,102.280238 86.2726593,104.461694 83.513684,105.671152 C81.2270908,106.673576 78.9669245,107.196782 76.4817987,107.437218 C71.0203357,107.966046 64.4865987,106.716901 59.7607964,103.849523 C54.2686121,100.517478 51.2186099,94.7989286 49.7717335,88.7129442 C48.0913088,81.6460323 49.1355043,73.6726057 53.0992189,67.6388757 C53.2336661,69.781637 57.5349852,70.703365 61.0154166,70.1662691 C70.6728211,68.675365 76.4180436,32.1184491 101.441738,25.5998777 C121.403017,20.3995724 135.651446,29.4743102 136.862131,30.2568033 C138.299428,31.1854765 138.85043,30.796545 140.483286,30.4052984 C146.829392,28.8846292 153.741035,28.1960616 160.187893,29.4782789 C166.528383,30.7396605 172.606255,34.0244119 177.74696,37.856181 C187.273882,44.9574883 195.508524,56.4379129 195.90592,68.6796644 Z'
+            id={path2}
+          />
+          <path
+            d='M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z'
+            id={path3}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Short-Hair/Shaggy-Mullet' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            {this.props.children}
+            <mask id={mask2} fill='white'>
+              <use xlinkHref={'#' + path2} />
+            </mask>
+            <use
+              id='Hair'
+              stroke='none'
+              fill='#1D2633'
+              fillRule='evenodd'
+              xlinkHref={'#' + path2}
+            />
+            <HairColor maskID={mask2} />
+            <path
+              d='M175.126419,166.897818 C175.841424,169.13759 176.874789,171.230601 178.55519,172.685954 C180.17619,174.090053 183.068114,173.745469 185.098621,173.802748 C186.770693,173.850632 188.444623,173.856087 190.114529,173.783655 C190.95366,173.747287 191.327571,174.79771 190.648775,175.281705 C190.518773,175.374442 190.388771,175.462634 190.25846,175.543856 C189.20761,176.198779 188.11838,176.802787 187.008721,177.356184 C184.485135,178.614206 181.821334,179.600077 179.02722,180.090436 C177.110792,180.426519 175.211229,180.489668 173.372596,180.266511 C173.858877,180.986862 174.419563,181.642356 175.071506,182.207788 C176.801481,183.708407 179.887821,183.340135 182.054832,183.401352 C183.839313,183.452528 185.625776,183.458358 187.407944,183.380946 C188.303488,183.342078 188.702535,184.464709 187.978106,184.981974 C187.839364,185.081086 187.700623,185.175341 187.561551,185.262145 C186.440057,185.962089 185.2776,186.607617 184.093342,187.199055 C181.400104,188.543555 178.557223,189.597195 175.57527,190.121262 C170.075488,191.087126 164.705859,189.943766 160.380755,186.413279 C159.16361,185.419765 158.027363,184.287616 157,183.053001 L157,180.610951 C163.949635,177.309539 170.111406,172.618864 175.126419,166.897818 Z M81.3150549,151.593977 C80.572738,153.13892 79.8051751,154.672522 79.0058562,156.190972 C74.2106831,165.300379 68.2421528,176.792949 56.4993303,177.596328 C55.4105393,177.670743 54.9804404,178.942941 55.8287461,179.588187 C66.9485528,188.041497 92.2609618,193.18734 101.273548,191.569729 C104.095212,191.063278 106.638877,190.402091 109,189.610443 L109,180.610951 C96.5625107,174.702544 86.6484598,164.344483 81.3150549,151.593977 Z'
+              id='Shadow'
+              stroke='none'
+              fillOpacity='0.16'
+              fill='#000000'
+              fillRule='evenodd'
+            />
+            <FacialHair />
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShortCurly.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShortCurly.tsx
new file mode 100644
index 000000000..61aae5f9a
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShortCurly.tsx
@@ -0,0 +1,75 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class ShortHairShortCurly extends React.Component {
+  static optionValue = 'ShortHairShortCurly'
+
+  private filter1 = uniqueId('react-filter-')
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { filter1, mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path2} x='0' y='0' width='264' height='280' />
+          <path
+            d='M94.2519269,52.0221149 C94.3749353,51.9677149 94.0696712,51.9468149 93.3361345,51.9595149 C94.2276637,51.9577149 94.5329279,51.9785149 94.2519269,52.0221149 M86.1169775,36.3015924 C86.1148422,36.2819924 86.1337548,36.4526924 86.1169775,36.3015924 M193.765056,70.7656665 C193.500946,67.448734 193.03295,64.1518864 192.246676,60.9110823 C191.622233,58.3353492 190.769007,55.8775343 189.760006,53.4200433 C189.150703,51.9353766 187.727538,49.8961062 187.560324,48.2944933 C187.395466,46.7168527 188.626521,44.969138 188.889285,43.1323368 C189.144311,41.3447761 189.100909,39.4652134 188.734183,37.6938503 C187.901144,33.6710288 185.140271,29.9300447 180.877167,28.8814158 C179.925362,28.6471994 177.913417,28.9358396 177.240862,28.3815597 C176.469729,27.7459682 175.932761,25.5806808 175.234637,24.7121687 C173.244224,22.2362125 170.13984,20.6417265 166.865887,21.1976261 C164.454917,21.606776 165.839391,22.1053363 164.032005,20.6864317 C163.027041,19.8976114 162.276095,18.6931622 161.300066,17.8392279 C159.832826,16.5563826 158.149588,15.4581893 156.408146,14.556958 C151.851325,12.19892 146.654249,10.4848961 141.564162,9.64942693 C132.278934,8.12523827 122.368926,9.45408458 113.368668,11.8688141 C108.890239,13.0703477 104.381531,14.5951842 100.222053,16.6117782 C98.4385542,17.4764029 97.4090304,18.1936301 95.5494951,18.4200717 C92.6207355,18.7767416 90.1404579,18.7589243 87.3661268,20.0009517 C78.8298269,23.8229236 74.9849256,32.6897818 78.3066539,41.1750259 C78.974835,42.8815988 79.8795374,44.3801954 81.1267416,45.7586062 C82.6474761,47.4392631 83.1975648,47.1085093 81.8877817,49.0411999 C79.9289949,51.9311653 78.2777195,55.0129095 76.9332826,58.2128958 C73.4043038,66.6145606 72.8138416,76.0771643 73.043634,85.0373203 C73.1240445,88.1741362 73.2586228,91.3495022 73.753198,94.4561907 C73.966841,95.8009106 74.0267283,98.3293468 75.0353925,99.3271154 C75.5471264,99.8331265 76.2762042,100.115288 77.0035997,99.9137903 C78.7130802,99.4401742 78.1253096,98.1787097 78.1650102,97.0076274 C78.364859,91.1240324 78.0950295,85.9191145 79.4943071,80.1064647 C80.5278683,75.8118486 82.2504702,71.9114806 84.4827873,68.0713675 C87.3213795,63.1871608 90.3857268,58.8977279 94.2895061,54.7155226 C95.2073299,53.7320079 95.4078515,53.3150832 96.6385698,53.243814 C97.5705244,53.1900382 98.9338023,53.8282213 99.8398505,54.0491558 C101.837665,54.5360539 103.83918,55.0174448 105.873331,55.3452831 C109.613261,55.9481556 113.316519,55.9886494 117.090094,55.8704074 C124.516459,55.6381346 131.974787,55.1172217 139.175061,53.2470535 C143.956964,52.00535 148.196516,49.7762443 152.776887,48.1422364 C152.858644,48.1130808 154.006596,47.2951049 154.207791,47.3284719 C154.488723,47.3747968 156.184746,49.1542588 156.471061,49.3784327 C158.696649,51.1238798 161.137899,51.8566566 163.541467,53.2081794 C166.504881,54.8745825 163.634999,52.4899804 165.269452,54.5668292 C165.745859,55.1716454 165.989782,56.2931632 166.371984,56.9783192 C167.587899,59.1610999 169.279548,61.0795367 171.302932,62.6017816 C173.258018,64.0725184 176.196198,64.7829426 177.193087,66.697168 C177.961865,68.1740599 178.220929,70.1812592 178.841334,71.7579279 C180.468722,75.8931602 182.617937,79.7494709 184.767152,83.6443317 C186.498502,86.7830913 188.392354,89.5250111 188.584801,93.1117947 C188.651754,94.3603012 187.463764,101.849397 190.357534,99.5716982 C190.786502,99.2341415 191.711391,95.415733 191.901483,94.7678314 C192.672616,92.135083 192.94682,89.3866841 193.29605,86.6816947 C193.990474,81.3021672 194.218584,76.1837441 193.765056,70.7656665'
+            id={path1}
+          />
+          <filter
+            x='-0.8%'
+            y='-2.0%'
+            width='101.5%'
+            height='108.0%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+        </defs>
+        <mask id={mask2} fill='white'>
+          <use xlinkHref={'#' + path2} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Short-Hair/Short-Curly' mask={`url(#${mask2})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <FacialHair />
+            <mask id={mask1} fill='white'>
+              <use xlinkHref={'#' + path1} />
+            </mask>
+            <use
+              id='Short-Hair'
+              stroke='none'
+              fill='#28354B'
+              fillRule='evenodd'
+              xlinkHref={'#' + path1}
+            />
+            <HairColor maskID={mask1} />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShortFlat.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShortFlat.tsx
new file mode 100644
index 000000000..5a9cda876
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShortFlat.tsx
@@ -0,0 +1,76 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class ShortHairShortFlat extends React.Component {
+  static optionValue = 'ShortHairShortFlat'
+
+  private filter1 = uniqueId('react-filter-')
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { filter1, mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path2} x='0' y='0' width='264' height='280' />
+
+          <path
+            d='M180.14998,39.9204083 C177.390206,37.1003988 174.185913,34.7068297 171.069252,32.3065503 C170.381566,31.777442 169.682843,31.2610833 169.010544,30.7118441 C168.857687,30.5870323 167.291999,29.4657388 167.104691,29.0530544 C166.653816,28.0602634 166.915042,28.8332916 166.977255,27.6485857 C167.055857,26.150508 170.11064,21.9193194 167.831176,20.9490079 C166.828413,20.522232 165.039628,21.6579526 164.077671,22.0330592 C162.196235,22.7671676 160.291721,23.3932399 158.346734,23.9330847 C159.278588,22.0763407 161.055333,18.3594977 157.71591,19.3543018 C155.114345,20.1293431 152.690052,22.1219709 150.075777,23.0594018 C150.940735,21.6415124 154.399901,17.2479341 151.274209,17.0023366 C150.301549,16.925839 147.471201,18.7503735 146.423952,19.1395717 C143.287223,20.3054888 140.083264,21.0590571 136.789999,21.6525844 C125.59203,23.6707114 112.497238,23.0953019 102.1368,28.1934632 C94.1494796,32.1236942 86.262502,38.2220278 81.648386,45.987539 C77.2011742,53.472559 75.537818,61.6641751 74.6069673,70.2412987 C73.9239644,76.535909 73.8684412,83.0425652 74.1878671,89.3599905 C74.2922241,91.4297869 74.5250203,100.970847 77.5319724,98.0813859 C79.0300967,96.641688 79.019059,90.8282073 79.3963495,88.8604076 C80.1472513,84.9452748 80.870057,81.0126951 82.122006,77.2227096 C84.3282191,70.5439339 86.9307879,63.4296587 92.4269209,58.8297383 C95.9539853,55.8782066 98.4307906,51.8889248 101.806002,48.9112229 C103.322188,47.5738572 102.165231,47.7130963 104.602902,47.888571 C106.240504,48.006337 107.885464,48.0512961 109.52641,48.0942421 C113.322394,48.1928837 117.124399,48.16772 120.921387,48.1811407 C128.56821,48.208653 136.179243,48.316689 143.818708,47.9164188 C147.213653,47.7385955 150.617965,47.6423024 154.00388,47.3282597 C155.895349,47.152785 159.251496,45.9405668 160.808488,46.8669256 C162.233362,47.7144383 163.71309,50.4817719 164.736257,51.615144 C167.153525,54.2935659 170.035717,56.3392052 172.862385,58.5354911 C178.756547,63.114945 181.732392,68.8666908 183.522515,76.023241 C185.305949,83.1532854 184.805905,89.76815 187.013456,96.78479 C187.401784,98.0184813 188.428965,100.14498 189.695296,98.2389151 C189.930434,97.8849461 189.869559,95.9390277 189.869559,94.819339 C189.869559,90.2995934 191.014141,86.9083772 190.999758,82.3591197 C190.943566,68.5271489 190.49637,50.4908308 180.14998,39.9204083 Z'
+            id={path1}
+          />
+          <filter
+            x='-0.8%'
+            y='-2.0%'
+            width='101.5%'
+            height='108.0%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+        </defs>
+        <mask id={mask2} fill='white'>
+          <use xlinkHref={'#' + path2} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Short-Hair/Short-Flat' mask={`url(#${mask2})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <FacialHair />
+            <mask id={mask1} fill='white'>
+              <use xlinkHref={'#' + path1} />
+            </mask>
+            <use
+              id='Short-Hair'
+              stroke='none'
+              fill='#1F3140'
+              fillRule='evenodd'
+              xlinkHref={'#' + path1}
+            />
+            <HairColor maskID={mask1} />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShortRound.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShortRound.tsx
new file mode 100644
index 000000000..ca97430ba
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShortRound.tsx
@@ -0,0 +1,75 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class ShortHairShortRound extends React.Component {
+  static optionValue = 'ShortHairShortRound'
+
+  private filter1 = uniqueId('react-filter-')
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { filter1, mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path2} x='0' y='0' width='264' height='280' />
+          <path
+            d='M167.308863,35.006118 C147.121091,23.3065109 127.128954,25.2219854 112.036894,29.0299707 C96.9448338,32.8379559 88.0168242,43.6513048 80.3566792,59.6480618 C76.5956048,67.5028569 74.3660182,76.7914798 74.0230569,85.4813651 C73.8884429,88.8932666 74.3484305,92.415154 75.267729,95.7003546 C75.6049405,96.9061873 77.4232441,101.086987 77.9224658,97.70885 C78.0885348,96.584253 77.4804043,95.0327505 77.4215529,93.8376154 C77.3444374,92.2693977 77.4273028,90.6807875 77.5341822,89.1149098 C77.7340739,86.1874141 78.2559568,83.3154127 79.1847257,80.524647 C80.5119249,76.5367405 82.2013644,72.212859 84.7874413,68.8480942 C91.1883705,60.5205939 102.268658,60.045883 111.066257,55.4635848 C110.302881,56.8686624 107.359637,59.1432635 108.379389,60.7268592 C109.083576,61.8207003 111.749474,61.4890712 113.022219,61.4539693 C116.370996,61.3623702 119.734993,60.7796791 123.042844,60.306974 C128.255923,59.5618115 133.140585,58.0517626 138.046555,56.2181078 C142.06299,54.7164165 146.650012,53.3257139 149.66868,50.1404701 C154.539813,55.1881187 160.809849,59.9345599 167.070414,63.1428706 C172.68835,66.0222267 181.748751,67.461069 185.182761,73.3006826 C189.2479,80.2147477 187.37751,88.7073939 188.619138,96.2008069 C189.091302,99.05041 190.164155,98.986558 190.751315,96.4378281 C191.748406,92.1082634 192.219217,87.6102098 191.901961,83.1592929 C191.183568,73.1114668 187.496636,46.7057251 167.308863,35.006118 Z'
+            id={path1}
+          />
+          <filter
+            x='-0.8%'
+            y='-2.0%'
+            width='101.5%'
+            height='108.0%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+        </defs>
+        <mask id={mask2} fill='white'>
+          <use xlinkHref={'#' + path2} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Short-Hair/Short-Round' mask={`url(#${mask2})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <FacialHair />
+            <mask id={mask1} fill='white'>
+              <use xlinkHref={'#' + path1} />
+            </mask>
+            <use
+              id='Short-Hair'
+              stroke='none'
+              fill='#28354B'
+              fillRule='evenodd'
+              xlinkHref={'#' + path1}
+            />
+            <HairColor maskID={mask1} />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShortWaved.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShortWaved.tsx
new file mode 100644
index 000000000..9d9cc39fb
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairShortWaved.tsx
@@ -0,0 +1,75 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class ShortHairShortWaved extends React.Component {
+  static optionValue = 'ShortHairShortWaved'
+
+  private filter1 = uniqueId('react-filter-')
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { filter1, mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path2} x='0' y='0' width='264' height='280' />
+          <path
+            d='M183.679824,38.9488198 C189.086072,33.9985622 190.387393,23.9615454 187.317704,17.4493246 C183.549263,9.45385312 175.901319,8.45217737 168.572342,11.9686703 C161.664469,15.2835661 155.515175,16.3878671 147.950196,14.7817319 C140.691624,13.2406923 133.805566,10.5226172 126.303388,10.0762471 C113.978028,9.34292483 102.003367,13.914565 93.6031232,23.1292512 C92.0003538,24.8871655 90.7089493,26.8971594 89.4882796,28.9343872 C88.5115454,30.5644351 87.4105298,32.3133822 86.9950459,34.1921885 C86.7973853,35.0855929 87.165272,37.2898774 86.7203704,38.0218712 C86.2391099,38.8123183 84.4244668,39.5373375 83.6510124,40.1238625 C82.0842713,41.3125222 80.7267597,42.6539573 79.4713836,44.1710842 C76.8052796,47.3926541 75.3376994,50.7577001 74.1034777,54.7428152 C70.0005333,67.9877849 69.6528094,83.7412616 74.9569218,96.7467724 C75.6639385,98.4811062 77.8550622,102.098564 79.1431613,98.3847912 C79.3976741,97.6508047 78.8086588,95.1907873 78.8099809,94.4501584 C78.8146084,91.7300906 80.3160587,73.7213568 86.857084,63.6330196 C88.9862338,60.3491948 98.8298903,48.0522456 100.840541,47.9536058 C101.9058,49.6464245 112.720532,60.4624529 140.783385,59.1948919 C153.445253,58.6229725 163.18265,52.9341181 165.520833,50.4680909 C166.549375,56.0008881 178.51323,64.2839965 180.33625,67.6921976 C185.602529,77.5376948 186.770677,97.9957204 188.780988,97.9573368 C190.791299,97.9189532 192.234429,92.7197798 192.647929,91.7270713 C195.719601,84.351669 196.242509,75.0948338 195.914948,67.1684434 C195.487565,56.9663626 191.276535,45.9419513 183.679824,38.9488198 Z'
+            id={path1}
+          />
+          <filter
+            x='-0.8%'
+            y='-2.0%'
+            width='101.5%'
+            height='108.0%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+        </defs>
+        <mask id={mask2} fill='white'>
+          <use xlinkHref={'#' + path2} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Short-Hair/Short-Waved' mask={`url(#${mask2})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <FacialHair />
+            <mask id={mask1} fill='white'>
+              <use xlinkHref={'#' + path1} />
+            </mask>
+            <use
+              id='Short-Hair'
+              stroke='none'
+              fill='#28354B'
+              fillRule='evenodd'
+              xlinkHref={'#' + path1}
+            />
+            <HairColor maskID={mask1} />
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairSides.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairSides.tsx
new file mode 100644
index 000000000..eeb6f79d3
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairSides.tsx
@@ -0,0 +1,54 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class ShortHairSides extends React.Component {
+  static optionValue = 'ShortHairSides'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private path3 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, path1, path2, path3 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z'
+            id={path2}
+          />
+          <path
+            d='M6,28 C0.923687084,28.0709555 0,26.9937684 0,23 C1.30010922e-16,17.3439836 4.0408529,6.77808536 8,2 C9.17612094,-0.170695788 11.6189856,-1.43187215 11,3 C8.3404922,11.4766099 11.4173429,27.914487 6,28 Z M120,28 C114.582657,27.914487 117.659508,11.4766099 115,3 C114.381014,-1.43187215 116.823879,-0.170695788 118,2 C121.959147,6.77808536 126,17.3439836 126,23 C126,26.9937684 125.076313,28.0709555 120,28 Z'
+            id={path3}
+          />
+        </defs>
+        <mask id={mask2} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Short-Hair/Sides' mask={`url(#${mask2})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <FacialHair />
+            <g
+              id='Hair'
+              strokeWidth='1'
+              fillRule='evenodd'
+              transform='translate(70.000000, 74.000000)'>
+              <mask id={mask1} fill='white'>
+                <use xlinkHref={'#' + path3} />
+              </mask>
+              <use id='Sides' fill='#9E7A7A' xlinkHref={'#' + path3} />
+              <HairColor maskID={mask1} />
+            </g>
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairTheCaesar.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairTheCaesar.tsx
new file mode 100644
index 000000000..e542d3f79
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairTheCaesar.tsx
@@ -0,0 +1,75 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class ShortHairTheCaesar extends React.Component {
+  static optionValue = 'ShortHairTheCaesar'
+
+  private filter1 = uniqueId('react-filter-')
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { filter1, mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M1,64 C1.34685629,65.488448 2.67275588,65.2226722 3,64 C2.53726005,62.445722 6.29594493,35.2480719 16,28 C19.618222,25.4833872 39.0082164,23.2319099 58.3126144,23.245568 C77.4086061,23.2590787 96.4208396,25.5105561 100,28 C109.704055,35.2480719 113.46274,62.445722 113,64 C113.327244,65.2226722 114.653144,65.488448 115,64 C115.719178,53.7019177 115,0.274362825 58,1 C1,1.72563718 0.280821545,53.7019177 1,64 Z'
+            id={path2}
+          />
+          <filter
+            x='-0.8%'
+            y='-2.0%'
+            width='101.5%'
+            height='108.0%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Short-Hair/The-Caesar' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <FacialHair />
+            <g
+              id='Hair'
+              strokeWidth='1'
+              fillRule='evenodd'
+              transform='translate(75.000000, 34.000000)'>
+              <mask id={mask2} fill='white'>
+                <use xlinkHref={'#' + path2} />
+              </mask>
+              <use id='Caesar' fill='#28354B' xlinkHref={'#' + path2} />
+              <HairColor maskID={mask2} />
+            </g>
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairTheCaesarSidePart.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairTheCaesarSidePart.tsx
new file mode 100644
index 000000000..f9951d7de
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/ShortHairTheCaesarSidePart.tsx
@@ -0,0 +1,75 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HairColor from './HairColor'
+
+export default class ShortHairTheCaesarSidePart extends React.Component {
+  static optionValue = 'ShortHairTheCaesarSidePart'
+
+  private filter1 = uniqueId('react-filter-')
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+
+  render () {
+    const { filter1, mask1, mask2, path1, path2 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M82.0179468,24.3784638 C74.9860629,23.6847351 66.6573358,23.2514721 58.3126144,23.245568 C39.0082164,23.2319099 19.618222,25.4833872 16,28 C6.29594493,35.2480719 2.53726005,62.445722 3,64 C2.67275588,65.2226722 1.34685629,65.488448 1,64 C0.280821545,53.7019177 1,1.72563718 58,1 C115,0.274362825 115.719178,53.7019177 115,64 C114.653144,65.488448 113.327244,65.2226722 113,64 C113.46274,62.445722 109.704055,35.2480719 100,28 C98.2407122,26.7763475 92.7526689,25.6101897 85.3587425,24.7390449 L89,16 L82.0179468,24.3784638 Z'
+            id={path2}
+          />
+          <filter
+            x='-0.8%'
+            y='-2.0%'
+            width='101.5%'
+            height='108.0%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Short-Hair/The-Caesar-+-Side-Part' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <FacialHair />
+            <g
+              id='Hair'
+              strokeWidth='1'
+              fillRule='evenodd'
+              transform='translate(75.000000, 34.000000)'>
+              <mask id={mask2} fill='white'>
+                <use xlinkHref={'#' + path2} />
+              </mask>
+              <use id='Caesar' fill='#28354B' xlinkHref={'#' + path2} />
+              <HairColor maskID={mask2} />
+            </g>
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/Turban.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/Turban.tsx
new file mode 100644
index 000000000..e991a3bc7
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/Turban.tsx
@@ -0,0 +1,104 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HatColor from './HatColor'
+
+export default class Turban extends React.Component {
+  static optionValue = 'Turban'
+
+  private filter1 = uniqueId('react-filter-')
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private mask3 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private path3 = uniqueId('react-path-')
+
+  render () {
+    const { filter1, mask1, mask2, mask3, path1, path2, path3 } = this
+    return (
+      <g id='Top' strokeWidth='1' fillRule='evenodd'>
+        <defs>
+          <rect id={path1} x='0' y='0' width='264' height='280' />
+          <path
+            d='M156,180.610951 C173.530782,172.282984 186.048193,155.114792 187.791419,134.867187 C193.569129,134.002364 198,129.018625 198,123 L198,110 C198,104.054007 193.675427,99.1180731 188,98.1659169 L188,92 C188,61.072054 162.927946,36 132,36 C101.072054,36 76,61.072054 76,92 L76,92 L76,98.1659169 C70.3245733,99.1180731 66,104.054007 66,110 L66,123 C66,129.018625 70.4308707,134.002364 76.2085808,134.867187 C77.9518066,155.114792 90.4692178,172.282984 108,180.610951 L108,199 L104,199 L104,199 C64.235498,199 32,231.235498 32,271 L32,280 L232,280 L232,271 C232,231.235498 199.764502,199 160,199 L156,199 L156,180.610951 Z M0,5.68434189e-14 L264,5.68434189e-14 L264,280 L0,280 L0,5.68434189e-14 Z'
+            id={path2}
+          />
+          <path
+            d='M83.9715543,55.8170792 C107.404232,69.414362 145.114919,82.1112884 139,138 C158.377483,132.360101 168.044149,116.801277 168,91.3235294 C167.918252,44.1482824 115.850571,6.80154462e-15 86,0 C85.3259486,0 84.6559706,0.0296343787 83.9916946,0.0880669528 C83.3328225,0.0296343217 82.6684563,0 82.0002187,0 C52.0737254,6.80154462e-15 0.0804892181,44.1482783 0.00021866091,91.3235294 C-0.0442202163,117.440393 9.62244645,132.999216 29.0002187,138 C22.8618971,82.1112789 60.5101967,69.4143577 83.9715662,55.8170722 Z'
+            id={path3}
+          />
+          <filter
+            x='-0.8%'
+            y='-2.0%'
+            width='101.5%'
+            height='108.0%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <g id='Mask' />
+        <g id='Top/Accesories/Turban' mask={`url(#${mask1})`}>
+          <g transform='translate(-1.000000, 0.000000)'>
+            <FacialHair />
+            <g
+              id='Behind'
+              strokeWidth='1'
+              fillRule='evenodd'
+              transform='translate(1.000000, 0.000000)'>
+              <mask id={mask2} fill='white'>
+                <use xlinkHref={'#' + path2} />
+              </mask>
+              <g id='Mask-Hair' />
+            </g>
+            <g
+              id='Turban'
+              strokeWidth='1'
+              fillRule='evenodd'
+              transform='translate(1.000000, 0.000000)'>
+              <path
+                d='M74.5304294,97.5 C73.529284,95.0905557 73,92.5798498 73,90 C73,71.7746033 99.4151998,57 132,57 C164.5848,57 191,71.7746033 191,90 C191,92.5798498 190.470716,95.0905557 189.469571,97.5 C183.398106,82.8878805 159.972341,72 132,72 C104.027659,72 80.6018941,82.8878805 74.5304294,97.5 Z'
+                id='Band'
+                fill='#EDECE3'
+              />
+              <g transform='translate(48.000000, 3.000000)'>
+                <mask id={mask3} fill='white'>
+                  <use xlinkHref={'#' + path3} />
+                </mask>
+                <use id='Turban-Mask' fill='#124C74' xlinkHref={'#' + path3} />
+                <HatColor maskID={mask3} defaultColor='Blue03' />
+              </g>
+              <path
+                d='M48.0110963,96.0123559 C48.3807929,121.112082 58.0438337,136.107963 77.0002187,141 C57.6224465,136.289117 47.9557798,121.632254 48.0002187,97.0294118 C48.0008313,96.6902213 48.0044682,96.351197 48.0110963,96.0123559 Z M152.645822,30.4681115 C153.39011,36.1953086 152.126202,42.8891982 148.000219,50.135763 C136.847465,71.5667661 76.561434,72.0039826 76.3339794,129.679698 C76.1051437,67.7612631 136.805324,67.3799133 148.000219,44.5441176 C150.669864,39.5668152 152.141299,34.8351296 152.645822,30.4681115 Z'
+                id='Shadow'
+                fillOpacity='0.16'
+                fill='#000000'
+              />
+            </g>
+            {this.props.children}
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/WinterHat1.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/WinterHat1.tsx
new file mode 100644
index 000000000..d6920bed4
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/WinterHat1.tsx
@@ -0,0 +1,85 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HatColor from './HatColor'
+
+export default class WinterHat1 extends React.Component {
+  static optionValue = 'WinterHat1'
+  private filter1 = uniqueId('react-filter-')
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private path3 = uniqueId('react-path-')
+
+  render() {
+    const { filter1, mask1, mask2, path1, path2, path3 } = this
+    return (
+      <g id="Top">
+        <defs>
+          <rect id={path3} x="0" y="0" width="264" height="280" />
+          <path
+            d="M120,54 L20,54 L20,155 C20,160.522847 15.5228475,165 10,165 C4.4771525,165 6.76353751e-16,160.522847 0,155 L0,54 L0,44 C-2.9759565e-15,19.699471 19.699471,4.46393476e-15 44,0 L96,0 C120.300529,-4.46393476e-15 140,19.699471 140,44 L140,54 L140,155 C140,160.522847 135.522847,165 130,165 C124.477153,165 120,160.522847 120,155 L120,54 Z"
+            id={path1}
+          />
+          <filter
+            x="-0.8%"
+            y="-2.8%"
+            width="101.7%"
+            height="111.1%"
+            filterUnits="objectBoundingBox"
+            id={filter1}>
+            <feOffset
+              dx="0"
+              dy="2"
+              in="SourceAlpha"
+              result="shadowOffsetOuter1"
+            />
+            <feColorMatrix
+              values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0"
+              type="matrix"
+              in="shadowOffsetOuter1"
+            />
+          </filter>
+          <rect id={path2} x="74" y="50" width="118" height="36" rx="8" />
+        </defs>
+        <mask id={mask1} fill="white">
+          <use xlinkHref={'#' + path3} />
+        </mask>
+        <g id="Mask" />
+        <g
+          id="Top/Accessories/Winter-Hat-1"
+          transform="translate(-1.000000, 0.000000)">
+          <g
+            id="hat"
+            strokeWidth="1"
+            fillRule="evenodd"
+            transform="translate(63.000000, 20.000000)">
+            <path
+              d="M1,48 L23.6714286,48 L23.6714286,153.664286 C23.6714286,159.924828 18.5962564,165 12.3357143,165 C6.07517216,165 1,159.924828 1,153.664286 L1,48 Z M116.328571,48 L139,48 L139,153.664286 C139,159.924828 133.924828,165 127.664286,165 C121.403744,165 116.328571,159.924828 116.328571,153.664286 L116.328571,48 Z"
+              id="inside"
+              fill="#F4F4F4"
+            />
+            <mask id={mask2} fill="white">
+              <use xlinkHref={'#' + path1} />
+            </mask>
+            <use id="hat-mask" fill="#D8D8D8" xlinkHref={'#' + path1} />
+            <HatColor maskID={mask2} defaultColor="Red" />
+          </g>
+          <g id="hat-front">
+            <use
+              fill="black"
+              fillOpacity="1"
+              filter={`url(#${path2})`}
+              xlinkHref={'#' + path2}
+            />
+            <use fill="#F4F4F4" fillRule="evenodd" xlinkHref={'#' + path2} />
+          </g>
+          <FacialHair />
+          {this.props.children}
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/WinterHat2.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/WinterHat2.tsx
new file mode 100644
index 000000000..16d7be19d
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/WinterHat2.tsx
@@ -0,0 +1,116 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HatColor from './HatColor'
+
+export default class WinterHat2 extends React.Component {
+  static optionValue = 'WinterHat2'
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private path3 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, mask2, path1, path2, path3 } = this
+    return (
+      <g id='Top'>
+        <defs>
+          <rect id={path3} x='0' y='0' width='264' height='280' />
+          <path
+            d='M72,21 C126.772655,21 144,68.8032255 144,103.04488 L144,176.910255 C144,196.404852 121.366901,196.446757 121.366901,165.988782 L121.366901,86.5347425 C121.366901,80.4596103 117.635097,77.5347425 111.551408,77.5347425 L72,77.5347425 L32.4485915,77.5347425 C26.3649028,77.5347425 22.6330986,80.4596103 22.6330986,86.5347425 L22.6330986,165.988782 C22.6330986,196.446757 -1.41137102e-14,196.404852 0,176.910255 L0,103.04488 C-7.11930515e-15,68.8032255 17.2273451,21 72,21 Z'
+            id={path1}
+          />
+          <path
+            d='M101.428403,98.1685688 C98.9148372,100.462621 96.23722,101.494309 92.8529444,100.772863 C92.2705777,100.648833 89.8963391,96.2345713 83.9998344,96.2345713 C78.1033297,96.2345713 75.7294253,100.648833 75.1467245,100.772863 C71.7624488,101.494309 69.0848316,100.462621 66.5712661,98.1685688 C61.8461772,93.855604 57.9166219,87.9081858 60.2778299,81.4191814 C61.5083844,78.0369425 63.5097479,74.3237342 67.1506257,73.2459109 C71.0384163,72.0955419 76.4968931,73.2439051 80.4147542,72.4582708 C81.6840664,72.2035248 83.0706538,71.7508657 83.9998344,71 C84.929015,71.7508657 86.3159365,72.2035248 87.5845805,72.4582708 C91.5027758,73.2439051 96.9612525,72.0955419 100.849043,73.2459109 C104.489921,74.3237342 106.491284,78.0369425 107.722173,81.4191814 C110.083381,87.9081858 106.153826,93.855604 101.428403,98.1685688 M140.081033,26 C136.670693,34.4002532 137.987774,44.8580348 137.356666,53.6758724 C136.844038,60.8431942 135.33712,71.5857526 128.972858,76.214531 C125.718361,78.5816138 119.79436,82.5598986 115.54187,81.4501943 C112.614539,80.6863848 112.302182,72.290096 108.455284,69.1469801 C104.09172,65.5823153 98.6429854,64.0160432 93.1491481,64.2578722 C90.7785381,64.3622683 85.9841367,64.3374908 83.9999331,66.1604584 C82.0157295,64.3374908 77.2216647,64.3622683 74.8510547,64.2578722 C69.3568808,64.0160432 63.9081467,65.5823153 59.5445817,69.1469801 C55.6976839,72.290096 55.3856641,80.6863848 52.4583326,81.4501943 C48.2058427,82.5598986 42.2818421,78.5816138 39.0270077,76.214531 C32.6624096,71.5857526 31.1561652,60.8431942 30.642864,53.6758724 C30.0120926,44.8580348 31.3291729,34.4002532 27.9188335,26 C26.2597768,26 27.3540339,42.1288693 27.3540339,42.1288693 L27.3540339,62.4851205 C27.3856735,77.7732046 36.935095,100.655445 58.1080116,109.393004 C63.2861266,111.52982 75.0153111,115 83.9999331,115 C92.9845551,115 104.71374,111.860188 109.891855,109.723371 C131.064771,100.985813 140.614193,77.7732046 140.646169,62.4851205 L140.646169,42.1288693 C140.646169,42.1288693 141.740089,26 140.081033,26'
+            id={path2}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path3} />
+        </mask>
+        <g id='Mask' />
+        <g
+          id='Top/Accessories/Winter-Hat-2'
+          transform='translate(-1.000000, 0.000000)'
+        >
+          <g
+            id='hat'
+            strokeWidth='1'
+            fillRule='evenodd'
+            transform='translate(61.000000, 0.000000)'
+          >
+            <g
+              id='string'
+              transform='translate(0.000000, 176.000000)'
+              fill='#F4F4F4'
+            >
+              <circle id='puff' cx='9' cy='65' r='9' />
+              <rect x='8' y='0' width='2' height='58' />
+            </g>
+            <g
+              id='string'
+              transform='translate(126.000000, 168.000000)'
+              fill='#F4F4F4'
+            >
+              <circle id='puff' cx='9' cy='65' r='9' />
+              <rect x='8' y='0' width='2' height='58' />
+            </g>
+            <circle id='puff' fill='#F4F4F4' cx='72' cy='20' r='20' />
+            <mask id={mask2} fill='white'>
+              <use xlinkHref={'#' + path1} />
+            </mask>
+            <use id='Combined-Shape' fill='#F4F4F4' xlinkHref={'#' + path1} />
+            <HatColor maskID={mask2} defaultColor='Blue01' />
+            <rect
+              id='color-dark'
+              fillOpacity='0.2'
+              fill='#000000'
+              x='-1'
+              y='21'
+              width='146'
+              height='46'
+              mask={`url(#${mask2})`}
+            />
+            <g
+              id='light-triangles'
+              transform='translate(29.000000, 32.000000)'
+              fill='#FFFFFF'
+              fillOpacity='0.5'
+            >
+              <polygon
+                id='Triangle'
+                transform='translate(12.500000, 9.000000) rotate(180.000000) translate(-12.500000, -9.000000) '
+                points='12.5 0 25 18 0 18'
+              />
+              <polygon
+                id='Triangle'
+                transform='translate(43.500000, 9.000000) rotate(180.000000) translate(-43.500000, -9.000000) '
+                points='43.5 0 56 18 31 18'
+              />
+              <polygon
+                id='Triangle'
+                transform='translate(74.500000, 9.000000) rotate(180.000000) translate(-74.500000, -9.000000) '
+                points='74.5 0 87 18 62 18'
+              />
+            </g>
+            <g
+              id='dark-triangles'
+              transform='translate(13.000000, 41.000000)'
+              fill='#000000'
+              fillOpacity='0.5'
+            >
+              <polygon id='Triangle' points='12.5 0 25 18 0 18' />
+              <polygon id='Triangle' points='43.5 0 56 18 31 18' />
+              <polygon id='Triangle' points='74.5 0 87 18 62 18' />
+              <polygon id='Triangle' points='105.5 0 118 18 93 18' />
+            </g>
+          </g>
+          <FacialHair />
+          {this.props.children}
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/WinterHat3.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/WinterHat3.tsx
new file mode 100644
index 000000000..78cc84260
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/WinterHat3.tsx
@@ -0,0 +1,87 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HatColor from './HatColor'
+
+export default class WinterHat3 extends React.Component {
+  static optionValue = 'WinterHat3'
+  private filter1 = uniqueId('react-filter-')
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private path3 = uniqueId('react-path-')
+
+  render() {
+    const { filter1, mask1, mask2, path1, path2, path3 } = this
+    return (
+      <g id='Top'>
+        <defs>
+          <rect id={path3} x='0' y='0' width='264' height='280' />
+          <path
+            d='M66,0 L66,0 C102.450793,-6.69590214e-15 132,29.5492065 132,66 L132,71 L0,71 L0,66 C-4.46393476e-15,29.5492065 29.5492065,6.69590214e-15 66,0 Z'
+            id={path1}
+          />
+          <filter
+            x='-0.7%'
+            y='-1.7%'
+            width='101.4%'
+            height='106.8%'
+            filterUnits='objectBoundingBox'
+            id={filter1}
+          >
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+            />
+          </filter>
+          <path
+            d='M67.2846026,61.4514246 C83.229708,49.8171415 105.159178,44 133.073012,44 C160.985408,44 182.871592,49.8165424 198.731564,61.4496271 L198.731562,61.4496305 C200.786183,62.956669 202.000006,65.3523289 202.000006,67.900394 L202.000004,98.3697692 C202.000004,100.578907 200.209144,102.369768 198.000006,102.369768 C197.244444,102.369768 196.504332,102.155773 195.865355,101.752558 C179.223261,91.2508526 158.536251,86 133.804323,86 C108.883259,86 87.640395,91.3314713 70.0757313,101.994414 L70.0757317,101.994414 C68.1873241,103.140806 65.7271332,102.539283 64.5807417,100.650875 C64.2008775,100.02514 64.0000054,99.3071624 64.0000054,98.5751499 L64,67.914014 C64,65.358892 65.2205159,62.9574773 67.2846026,61.4514246 Z'
+            id={path2}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path3} />
+        </mask>
+        <g id='Mask' />
+        <g
+          id='Top/Accessories/Winter-Hat-3'
+          transform='translate(-1.000000, 0.000000)'
+        >
+          <g
+            id='hat'
+            strokeWidth='1'
+            fillRule='evenodd'
+            transform='translate(67.000000, 12.000000)'
+          >
+            <circle id='puff' fill='#F4F4F4' cx='66' cy='8' r='20' />
+            <mask id={mask2} fill='white'>
+              <use xlinkHref={'#' + path1} />
+            </mask>
+            <use id='hat-mask' fill='#D8D8D8' xlinkHref={'#' + path1} />
+            <HatColor maskID={mask2} defaultColor='Red' />
+          </g>
+          <g id='hat-front'>
+            <use
+              fill='black'
+              fillOpacity='1'
+              filter={`url(#${path2})`}
+              xlinkHref={'#' + path2}
+            />
+            <use fill='#F4F4F4' fillRule='evenodd' xlinkHref={'#' + path2} />
+          </g>
+          <FacialHair />
+          {this.props.children}
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/WinterHat4.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/WinterHat4.tsx
new file mode 100644
index 000000000..1b087bcda
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/WinterHat4.tsx
@@ -0,0 +1,127 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import FacialHair from './facialHair'
+import HatColor from './HatColor'
+
+export default class WinterHat4 extends React.Component {
+  static optionValue = 'WinterHat4'
+  private filter1 = uniqueId('react-filter-')
+  private mask1 = uniqueId('react-mask-')
+  private mask2 = uniqueId('react-mask-')
+  private mask3 = uniqueId('react-mask-')
+  private mask4 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private path3 = uniqueId('react-path-')
+  private path4 = uniqueId('react-path-')
+  private path5 = uniqueId('react-path-')
+
+  render () {
+    const {
+      filter1,
+      mask1,
+      mask2,
+      mask3,
+      mask4,
+      path1,
+      path2,
+      path3,
+      path4,
+      path5
+    } = this
+    return (
+      <g id='Top'>
+        <defs>
+          <rect id={path5} x='0' y='0' width='264' height='280' />
+          <path
+            d='M129.659138,38.3566287 C132.459581,45.3577056 134,52.9989608 134,61 L134,69 L2,69 L2,61 C2,52.9748603 3.54971254,45.3116754 6.36620203,38.2933809 C-0.0371821146,24.8304767 -1.28053094,13.7727805 2.63615554,5.12029235 C10.141056,2.84355825 18.8342301,4.64979084 28.7156778,10.5389901 C38.4862647,3.88774159 50.289117,-4.77047603e-15 63,-7.10542736e-15 L73,-7.10542736e-15 C85.7221104,-9.44244112e-15 97.5345852,3.89461262 107.310208,10.5566215 C117.203883,4.65339747 125.906912,2.84128775 133.419297,5.12029235 C137.342115,13.7863263 136.088729,24.8651051 129.659138,38.3566287 Z'
+            id={path1}
+          />
+          <path
+            d='M28.7156857,10.5389848 C18.758718,17.3171083 10.9122881,26.9651756 6.36620203,38.2933809 C-0.0371821146,24.8304767 -1.28053094,13.7727805 2.63615554,5.12029235 C10.1410556,2.84355836 18.8342292,4.64979066 28.7156763,10.5389892 Z M129.659138,38.3566287 C125.120833,27.0109143 117.273404,17.34646 107.310208,10.5566215 C117.203883,4.65339747 125.906912,2.84128775 133.419297,5.12029235 C137.342115,13.7863263 136.088729,24.8651051 129.659138,38.3566287 Z'
+            id={path2}
+          />
+          <path
+            d='M21.8615933,15.9591438 C17.3889306,20.0465694 13.5271638,24.7913314 10.4291788,30.040544 C7.50356643,21.9322189 7.00287124,16.3214118 8.92709323,13.2081228 C11.5782173,12.0615989 15.8897174,12.9786059 21.8615933,15.9591438 Z M125.352616,29.6737564 C122.278044,24.5465519 118.471613,19.9084198 114.077736,15.903773 C119.880509,13.0520429 124.083178,12.1889392 126.68574,13.3144617 C128.572308,16.3668294 128.127934,21.8199276 125.352616,29.6737564 Z'
+            id={path3}
+          />
+          <filter
+            x='-0.7%'
+            y='-1.7%'
+            width='101.4%'
+            height='106.8%'
+            filterUnits='objectBoundingBox'
+            id={filter1}
+          >
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+            />
+          </filter>
+          <path
+            d='M67.2846026,61.4514246 C83.229708,49.8171415 105.159178,44 133.073012,44 C160.985408,44 182.871592,49.8165424 198.731564,61.4496271 L198.731562,61.4496305 C200.786183,62.956669 202.000006,65.3523289 202.000006,67.900394 L202.000004,98.3697692 C202.000004,100.578907 200.209144,102.369768 198.000006,102.369768 C197.244444,102.369768 196.504332,102.155773 195.865355,101.752558 C179.223261,91.2508526 158.536251,86 133.804323,86 C108.883259,86 87.640395,91.3314713 70.0757313,101.994414 L70.0757317,101.994414 C68.1873241,103.140806 65.7271332,102.539283 64.5807417,100.650875 C64.2008775,100.02514 64.0000054,99.3071624 64.0000054,98.5751499 L64,67.914014 C64,65.358892 65.2205159,62.9574773 67.2846026,61.4514246 Z'
+            id={path4}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path5} />
+        </mask>
+        <g id='Mask' />
+        <g
+          id='Top/Accessories/Winter-Hat-4'
+          transform='translate(-1.000000, 0.000000)'
+        >
+          <g
+            id='hat'
+            strokeWidth='1'
+            fillRule='evenodd'
+            transform='translate(65.000000, 4.000000)'
+          >
+            <mask id={mask2} fill='white'>
+              <use xlinkHref={'#' + path1} />
+            </mask>
+            <use id='hat-mask' fill='#D8D8D8' xlinkHref={'#' + path1} />
+            <HatColor maskID={mask2} defaultColor='Red' />
+            <mask id={mask3} fill='white'>
+              <use xlinkHref={'#' + path2} />
+            </mask>
+            <use
+              id='shadow'
+              fillOpacity='0.24'
+              fill='#000000'
+              xlinkHref={'#' + path2}
+            />
+            <mask id={mask4} fill='white'>
+              <use xlinkHref={'#' + path3} />
+            </mask>
+            <use
+              id='light'
+              fillOpacity='0.300000012'
+              fill='#FFFFFF'
+              xlinkHref={'#' + path3}
+            />
+          </g>
+          <g id='hat-front'>
+            <use
+              fill='black'
+              fillOpacity='1'
+              filter={`url(#${path4})`}
+              xlinkHref={'#' + path4}
+            />
+            <use fill='#F4F4F4' fillRule='evenodd' xlinkHref={'#' + path4} />
+          </g>
+          <FacialHair />
+          {this.props.children}
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Blank.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Blank.tsx
new file mode 100644
index 000000000..2560fb000
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Blank.tsx
@@ -0,0 +1,9 @@
+import * as React from 'react'
+
+export default class Blank extends React.Component {
+  static optionValue = 'Blank'
+
+  render () {
+    return null
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Kurt.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Kurt.tsx
new file mode 100644
index 000000000..03438c294
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Kurt.tsx
@@ -0,0 +1,70 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+export default class Kurt extends React.Component {
+  static optionValue = 'Kurt'
+
+  private filter1 = uniqueId('react-filter-')
+
+  render () {
+    const { filter1 } = this
+    return (
+      <g
+        id='Top/_Resources/Kurt'
+        fill='none'
+        transform='translate(62.000000, 85.000000)'
+        strokeWidth='1'>
+        <defs>
+          <filter
+            x='-0.8%'
+            y='-2.0%'
+            width='101.5%'
+            height='108.0%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.16 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+        </defs>
+        <g
+          id='Kurts'
+          filter={`url(#${filter1})`}
+          transform='translate(5.000000, 2.000000)'>
+          <path
+            d='M66,11.1111111 C54.9625586,11.1111111 53.3705645,2.0266011 30.6705882,0.740740741 C7.98552275,-0.283199952 0.815225204,6.4494855 0.776470588,11.1111111 C0.813236892,15.4042795 -0.352293566,26.5612661 14.3647059,39.6296296 C29.1367705,55.1420807 44.2704162,49.8818301 49.6941176,44.8148148 C55.1352081,42.4731118 61.3403442,21.4596351 66,21.4814815 C70.6596558,21.5033279 76.8647919,42.4731118 82.3058824,44.8148148 C87.7295838,49.8818301 102.86323,55.1420807 117.635294,39.6296296 C132.352294,26.5612661 131.186763,15.4042795 131.223529,11.1111111 C131.184775,6.4494855 124.014477,-0.283199952 101.329412,0.740740741 C78.6294355,2.0266011 77.0374414,11.1111111 66,11.1111111 Z'
+            id='It!'
+            fill='#F4F4F4'
+            fillRule='nonzero'
+          />
+          <path
+            d='M55.1294118,21.4814815 C55.5103632,13.8233491 42.2156493,5.64243259 27.9529412,5.92592593 C13.6973442,6.22450879 11.8417942,15.3786982 11.6470588,18.8888889 C11.2982286,27.0220633 20.014463,45.3037598 36.1058824,44.8148148 C52.1972736,44.305848 54.9092435,26.5344305 55.1294118,21.4814815 Z'
+            id='Did'
+            fill='#2F383B'
+            fillRule='nonzero'
+          />
+          <path
+            d='M120.352941,21.4814815 C120.733893,13.8233491 107.439179,5.64243259 93.1764706,5.92592593 C78.9208736,6.22450879 77.0653236,15.3786982 76.8705882,18.8888889 C76.521758,27.0220633 85.2379924,45.3037598 101.329412,44.8148148 C117.420803,44.305848 120.132773,26.5344305 120.352941,21.4814815 Z'
+            id='Courtney'
+            fill='#2F383B'
+            fillRule='nonzero'
+            transform='translate(98.611765, 25.370370) scale(-1, 1) translate(-98.611765, -25.370370) '
+          />
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Prescription01.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Prescription01.tsx
new file mode 100644
index 000000000..72e993539
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Prescription01.tsx
@@ -0,0 +1,72 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+export default class Prescription01 extends React.Component {
+  static optionValue = 'Prescription01'
+
+  private filter1 = uniqueId('react-filter-')
+
+  render () {
+    const { filter1 } = this
+    return (
+      <g
+        id='Top/_Resources/Prescription-01'
+        fill='none'
+        transform='translate(62.000000, 85.000000)'
+        strokeWidth='1'>
+        <defs>
+          <filter
+            x='-0.8%'
+            y='-2.4%'
+            width='101.5%'
+            height='109.8%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+        </defs>
+        <g
+          id='Glasses'
+          filter={`url(#${filter1})`}
+          transform='translate(8.000000, 8.000000)'
+          fill='#D6EAF2'>
+          <path
+            d='M46.2491397,7.27516667 C48.6207695,7.2975 49.7419096,7.69183333 50.1459601,10.1651667 C50.5553446,12.6705 50.1572949,15.4871667 49.6852359,17.9548333 C48.9648125,21.7228333 47.7666627,25.4145 44.9776475,28.1685 C43.5084639,29.6188333 41.7165732,30.7748333 39.8106684,31.5641667 C38.7985419,31.9835 37.7297416,32.2861667 36.6612747,32.5158333 C36.3489024,32.5828333 33.6822357,32.9501667 35.3177735,32.7635 C31.5009631,33.1991667 27.3601122,33.1818333 24.1723805,30.7525 C20.6396056,28.0601667 18.2203032,23.7998333 17.1565036,19.5561667 C16.5340925,17.0731667 15.2262624,11.1345 17.6158944,9.14916667 C20.3532365,6.8745 46.2491397,7.27516667 46.2491397,7.27516667 L46.2491397,7.27516667 Z M22.2178029,0.4905 C16.7774562,0.677833333 13.1466691,1.63383333 10.4633337,7.06916667 C5.54571911,17.0301667 13.9627711,31.9688333 23.352278,36.0395 C34.3293166,40.7991667 46.5921826,35.5318333 52.3955746,26.0058333 C55.4689587,20.9621667 57.0224862,13.3231667 56.9224737,7.50383333 C56.7951245,0.0765 51.6071427,-0.1295 45.5090472,0.0338333333 L22.2178029,0.4905 Z'
+            id='Frame-Stuff'
+          />
+          <path
+            d='M79.6805515,7.27256667 C77.3089217,7.29523333 76.1877816,7.68923333 75.7837311,10.1625667 C75.3743466,12.6679 75.7723963,15.4845667 76.244122,17.9522333 C76.9648787,21.7202333 78.1630285,25.4119 80.9520437,28.1659 C82.4212273,29.6162333 84.213118,30.7722333 86.1190228,31.5619 C87.1311493,31.9809 88.1999496,32.2835667 89.2684165,32.5132333 C89.5807888,32.5802333 92.2471221,32.9479 90.6119177,32.7609 C94.4287281,33.1965667 98.569579,33.1792333 101.757311,30.7499 C105.290086,28.0575667 107.709388,23.7975667 108.773188,19.5539 C109.395599,17.0705667 110.703095,11.1322333 108.313797,9.14656667 C105.576455,6.8719 79.6805515,7.27256667 79.6805515,7.27256667 L79.6805515,7.27256667 Z M103.711555,0.4879 C109.152235,0.675233333 112.783022,1.63156667 115.466357,7.06656667 C120.383639,17.0275667 111.96692,31.9662333 102.577413,36.0372333 C91.6003746,40.7965667 79.3375086,35.5292333 73.5337832,26.0035667 C70.4607325,20.9595667 68.907205,13.3205667 69.0068841,7.50123333 C69.1345667,0.0739 74.3225485,-0.1321 80.420644,0.0315666667 L103.711555,0.4879 Z'
+            id='Frame-Stuff'
+          />
+          <path
+            d='M13.1969483,4.9267 C9.78501392,5.11836667 5.88606327,5.16436667 2.69005822,6.63936667 C-0.69461078,8.20136667 -1.2176675,11.7387 3.04920921,12.2260333 C4.97094906,12.4457 6.89488267,12.0827 8.78716336,11.7450333 C10.336903,11.4683667 12.4419791,11.5580333 13.9064752,10.9657 C16.6355213,9.86236667 16.4603333,4.74003333 13.1969483,4.9267'
+            id='Frame-Stuff'
+          />
+          <path
+            d='M112.73467,4.9267 C116.146606,5.11836667 120.045559,5.16436667 123.241565,6.63936667 C126.626236,8.20136667 127.149293,11.7387 122.882414,12.2260333 C120.960673,12.4457 119.036739,12.0827 117.144457,11.7450333 C115.594717,11.4683667 113.489639,11.5580333 112.025143,10.9657 C109.295782,9.86236667 109.471283,4.74003333 112.73467,4.9267'
+            id='Frame-Stuff'
+          />
+          <path
+            d='M73.1094302,7.01263333 C71.1631869,4.71263333 66.0912197,3.38463333 62.8914864,3.38463333 C59.6914198,3.38463333 54.7681378,4.71263333 52.8222279,7.01263333 C51.8407719,8.1723 51.8074344,9.72396667 53.5083137,10.4509667 C55.6262451,11.3566333 57.5174814,9.7143 59.2126933,8.8553 C61.3809643,7.75663333 64.7120473,7.8773 66.7189648,8.8553 C68.4271783,9.68796667 70.3050797,11.3566333 72.4233444,10.4509667 C74.1242237,9.72396667 74.0908862,8.1723 73.1094302,7.01263333'
+            id='Frame-Stuff'
+          />
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Prescription02.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Prescription02.tsx
new file mode 100644
index 000000000..ee74e98d4
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Prescription02.tsx
@@ -0,0 +1,67 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+export default class Prescription02 extends React.Component {
+  static optionValue = 'Prescription02'
+
+  private filter1 = uniqueId('react-filter-')
+
+  render () {
+    const { filter1 } = this
+    return (
+      <g
+        id='Top/_Resources/Prescription-02'
+        fill='none'
+        transform='translate(62.000000, 85.000000)'
+        strokeWidth='1'>
+        <defs>
+          <filter
+            x='-0.8%'
+            y='-2.4%'
+            width='101.5%'
+            height='109.8%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+        </defs>
+        <g
+          id='Wayfarers'
+          filter={`url(#${filter1})`}
+          transform='translate(6.000000, 7.000000)'
+          fill='#252C2F'>
+          <path
+            d='M34,41 L31.2421498,41 C17.3147125,41 9,33.3359286 9,20.5 C9,10.127 10.8170058,0 32.5299306,0 L35.4700694,0 C57.1829942,0 59,10.127 59,20.5 C59,32.5686429 48.7212748,41 34,41 Z M32.3853606,6 C13,6 13,12.8410159 13,21.5015498 C13,28.5719428 16.116254,37 30.9709365,37 L34,37 C46.3649085,37 55,30.6270373 55,21.5015498 C55,12.8410159 55,6 35.6146394,6 L32.3853606,6 Z'
+            id='Left'
+            fillRule='nonzero'
+          />
+          <path
+            d='M96,41 L93.2421498,41 C79.3147125,41 71,33.3359286 71,20.5 C71,10.127 72.8170058,0 94.5299306,0 L97.4700694,0 C119.182994,0 121,10.127 121,20.5 C121,32.5686429 110.721275,41 96,41 Z M94.3853606,6 C75,6 75,12.8410159 75,21.5015498 C75,28.5719428 78.1194833,37 92.9709365,37 L96,37 C108.364909,37 117,30.6270373 117,21.5015498 C117,12.8410159 117,6 97.6146394,6 L94.3853606,6 Z'
+            id='Right'
+            fillRule='nonzero'
+          />
+          <path
+            d='M2.95454545,5.77156439 C3.64590909,5.09629136 11.2095455,0 32.5,0 C50.3513636,0 54.1302273,1.85267217 59.8502273,4.6518809 L60.2689233,4.85850899 C60.6666014,4.99901896 62.7002447,5.68982981 65.0790606,5.76579519 C67.2462948,5.67278567 69.1000195,5.08540191 69.641698,4.89719767 C76.1703915,1.7220864 82.5610971,0 97.5,0 C118.790455,0 126.354091,5.09629136 127.045455,5.77156439 C128.679318,5.77156439 130,7.06150904 130,8.65734659 L130,11.5431288 C130,13.1389663 128.679318,14.428911 127.045455,14.428911 C127.045455,14.428911 120.143997,14.428911 120.143997,17.3146932 C120.143997,20.2004754 118.181818,13.1389663 118.181818,11.5431288 L118.181818,8.73240251 C114.578575,7.35340151 108.128411,4.78617535 97.5,4.78617535 C85.6584651,4.78617535 79.7610984,6.88602813 74.7022935,8.97112368 L74.7588636,9.10752861 L74.7563667,11.0937608 L72.5391666,16.4436339 L69.8004908,15.3608351 C69.5558969,15.2641292 69.0281396,15.090392 68.2963505,14.9099044 C66.256272,14.4067419 64.1589087,14.253569 62.3040836,14.6343084 C61.6235903,14.7739931 60.9922286,14.9836085 60.4128127,15.266732 L57.7704824,16.5578701 L55.1266751,11.3962031 L55.2440909,9.10175705 L55.3248203,8.90683855 C50.9620526,6.87386374 46.9392639,4.78617535 32.5,4.78617535 C21.8721459,4.78617535 15.422131,7.3524397 11.8181818,8.7314671 L11.8181818,11.5431288 C11.8181818,13.1389663 8.86363636,20.2004754 8.86363636,17.3146932 C8.86363636,14.428911 2.95454545,14.428911 2.95454545,14.428911 C1.32363636,14.428911 0,13.1389663 0,11.5431288 L0,8.65734659 C0,7.06150904 1.32363636,5.77156439 2.95454545,5.77156439 Z'
+            id='Stuff'
+            fillRule='nonzero'
+          />
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Round.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Round.tsx
new file mode 100644
index 000000000..fa8e3bb1d
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Round.tsx
@@ -0,0 +1,54 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+export default class Round extends React.Component {
+  static optionValue = 'Round'
+
+  private path1 = uniqueId('react-path-')
+  private filter1 = uniqueId('react-filter-')
+
+  render () {
+    const { path1, filter1 } = this
+    return (
+      <g
+        id='Top/_Resources/Round'
+        fill='none'
+        transform='translate(62.000000, 85.000000)'>
+        <defs>
+          <path
+            d='M80.4646192,16.3941179 C84.3801509,8.45869677 92.552602,3 102,3 C110.919691,3 118.702887,7.86591082 122.839921,15.0880638 C123.050197,15.0306504 123.271519,15 123.5,15 L131.5,15 C132.880712,15 134,16.1192881 134,17.5 C134,18.8807119 132.880712,20 131.5,20 L124.963126,20 C125.637355,22.2145921 126,24.5649459 126,27 C126,40.254834 115.254834,51 102,51 C88.745166,51 78,40.254834 78,27 C78,25.5781066 78.1236513,24.1850936 78.3607874,22.8311273 C78.2762458,18.4553035 74.9135957,15 70.8624171,15 C67.1256697,15 63.9747186,17.9397535 63.4417635,21.8300629 C63.8073299,23.4951922 64,25.2250958 64,27 C64,40.254834 53.254834,51 40,51 C26.745166,51 16,40.254834 16,27 C16,24.5649459 16.3626451,22.2145921 17.0368738,20 L10.5,20 C9.11928813,20 8,18.8807119 8,17.5 C8,16.1192881 9.11928813,15 10.5,15 L10.5,15 L18.5,15 C18.728481,15 18.9498033,15.0306504 19.1600793,15.0880638 C23.2971127,7.86591082 31.0803092,3 40,3 C49.3521568,3 57.4549431,8.34919095 61.415666,16.15488 C63.4929212,13.0392725 66.9494432,11 70.8624171,11 C74.8746823,11 78.4070368,13.1440781 80.4646192,16.3941179 Z M40,47 C51.045695,47 60,38.045695 60,27 C60,15.954305 51.045695,7 40,7 C28.954305,7 20,15.954305 20,27 C20,38.045695 28.954305,47 40,47 Z M102,47 C113.045695,47 122,38.045695 122,27 C122,15.954305 113.045695,7 102,7 C90.954305,7 82,15.954305 82,27 C82,38.045695 90.954305,47 102,47 Z'
+            id={path1}
+          />
+          <filter
+            x='-0.8%'
+            y='-2.1%'
+            width='101.6%'
+            height='108.3%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+            />
+          </filter>
+        </defs>
+        <g id='Lennon-Glasses'>
+          <use
+            fill='black'
+            fillOpacity='1'
+            filter={`url(#${filter1})`}
+            xlinkHref={'#' + path1}
+          />
+          <use fill='#252C2F' fillRule='evenodd' xlinkHref={'#' + path1} />
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Sunglasses.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Sunglasses.tsx
new file mode 100644
index 000000000..5109bb296
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Sunglasses.tsx
@@ -0,0 +1,127 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+export default class Sunglasses extends React.Component {
+  static optionValue = 'Sunglasses'
+
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private filter1 = uniqueId('react-filter-')
+  private linearGradient1 = uniqueId('react-linear-gradient-')
+  private linearGradient2 = uniqueId('react-linear-gradient-')
+
+  render () {
+    const { path1, path2, filter1, linearGradient1, linearGradient2 } = this
+    return (
+      <g
+        id='Top/_Resources/Sunglasses'
+        fill='none'
+        transform='translate(62.000000, 85.000000)'
+        strokeWidth='1'>
+        <defs>
+          <filter
+            x='-0.8%'
+            y='-2.6%'
+            width='101.6%'
+            height='110.5%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+          <path
+            d='M47.0104611,6.27728008 C49.5212682,6.30134922 50.7082016,6.72633117 51.1359635,9.39189846 C51.5693724,12.0919529 51.1479634,15.1275382 50.648202,17.7869984 C49.8855011,21.8478573 48.6170388,25.8264499 45.6643523,28.794498 C44.1089507,30.3575551 42.2119044,31.6034024 40.1941529,32.4540848 C39.1226305,32.9060098 37.9911085,33.2322006 36.8599395,33.4797175 C36.5292357,33.5519249 33.7060778,33.9478084 35.4375958,33.7466335 C31.3967988,34.2161613 27.0129452,34.1974808 23.6381438,31.5793333 C19.8980507,28.6777448 17.3367734,24.0862872 16.2105455,19.5127916 C15.5516086,16.8368063 14.1670294,10.4365709 16.6968952,8.29693227 C19.5948762,5.84547255 47.0104611,6.27728008 47.0104611,6.27728008 L47.0104611,6.27728008 Z'
+            id={path1}
+          />
+          <path
+            d='M78.9192315,6.27468008 C76.4084239,6.29910846 75.2214902,6.72373117 74.7937283,9.38929846 C74.3603192,12.0893529 74.7817283,15.1249382 75.2811369,17.7843984 C76.0441909,21.8452573 77.3126534,25.8238499 80.2653406,28.791898 C81.8207425,30.3549551 83.7177893,31.6008024 85.7355412,32.4518441 C86.8070638,32.9034098 87.938586,33.2296006 89.0697553,33.4771175 C89.4004591,33.5493249 92.2232647,33.9455676 90.4920992,33.7440335 C94.5328971,34.2135613 98.9167517,34.1948808 102.291554,31.5767333 C106.031648,28.6751448 108.592926,24.0840464 109.719154,19.5105508 C110.378091,16.8342063 111.762317,10.4343302 109.232804,8.29433227 C106.334822,5.84287255 78.9192315,6.27468008 78.9192315,6.27468008 L78.9192315,6.27468008 Z'
+            id={path2}
+          />
+          <linearGradient
+            x1='50%'
+            y1='0%'
+            x2='50%'
+            y2='70.5058195%'
+            id={linearGradient1}>
+            <stop stopColor='#FFFFFF' stopOpacity='0.5' offset='0%' />
+            <stop stopColor='#000000' stopOpacity='0.5' offset='100%' />
+          </linearGradient>
+          <linearGradient
+            x1='50%'
+            y1='0%'
+            x2='50%'
+            y2='100%'
+            id={linearGradient2}>
+            <stop stopColor='#FFFFFF' stopOpacity='0.5' offset='0%' />
+            <stop stopColor='#000000' stopOpacity='0.5' offset='70.5058195%' />
+          </linearGradient>
+        </defs>
+        <g
+          id='Sunglasses'
+          filter={`url(#${filter1})`}
+          transform='translate(8.000000, 8.000000)'>
+          <g id='shades'>
+            <use
+              fillOpacity='0.700000048'
+              fill='#000000'
+              xlinkHref={'#' + path1}
+            />
+            <use
+              fill={`url(#${linearGradient1})`}
+              style={{ mixBlendMode: 'screen' }}
+              xlinkHref={'#' + path1}
+            />
+          </g>
+          <g id='shades'>
+            <use
+              fillOpacity='0.700000048'
+              fill='#000000'
+              xlinkHref={'#' + path2}
+            />
+            <use
+              fill={`url(#${linearGradient2})`}
+              style={{ mixBlendMode: 'screen' }}
+              xlinkHref={'#' + path2}
+            />
+          </g>
+          <g id='Glasses' fill='#252C2F'>
+            <path
+              d='M46.2491397,7.27516667 C48.6207695,7.2975 49.7419096,7.69183333 50.1459601,10.1651667 C50.5553446,12.6705 50.1572949,15.4871667 49.6852359,17.9548333 C48.9648125,21.7228333 47.7666627,25.4145 44.9776475,28.1685 C43.5084639,29.6188333 41.7165732,30.7748333 39.8106684,31.5641667 C38.7985419,31.9835 37.7297416,32.2861667 36.6612747,32.5158333 C36.3489024,32.5828333 33.6822357,32.9501667 35.3177735,32.7635 C31.5009631,33.1991667 27.3601122,33.1818333 24.1723805,30.7525 C20.6396056,28.0601667 18.2203032,23.7998333 17.1565036,19.5561667 C16.5340925,17.0731667 15.2262624,11.1345 17.6158944,9.14916667 C20.3532365,6.8745 46.2491397,7.27516667 46.2491397,7.27516667 L46.2491397,7.27516667 Z M22.2178029,0.4905 C16.7774562,0.677833333 13.1466691,1.63383333 10.4633337,7.06916667 C5.54571911,17.0301667 13.9627711,31.9688333 23.352278,36.0395 C34.3293166,40.7991667 46.5921826,35.5318333 52.3955746,26.0058333 C55.4689587,20.9621667 57.0224862,13.3231667 56.9224737,7.50383333 C56.7951245,0.0765 51.6071427,-0.1295 45.5090472,0.0338333333 L22.2178029,0.4905 Z'
+              id='Frame'
+            />
+            <path
+              d='M79.6805515,7.27256667 C77.3089217,7.29523333 76.1877816,7.68923333 75.7837311,10.1625667 C75.3743466,12.6679 75.7723963,15.4845667 76.244122,17.9522333 C76.9648787,21.7202333 78.1630285,25.4119 80.9520437,28.1659 C82.4212273,29.6162333 84.213118,30.7722333 86.1190228,31.5619 C87.1311493,31.9809 88.1999496,32.2835667 89.2684165,32.5132333 C89.5807888,32.5802333 92.2471221,32.9479 90.6119177,32.7609 C94.4287281,33.1965667 98.569579,33.1792333 101.757311,30.7499 C105.290086,28.0575667 107.709388,23.7975667 108.773188,19.5539 C109.395599,17.0705667 110.703095,11.1322333 108.313797,9.14656667 C105.576455,6.8719 79.6805515,7.27256667 79.6805515,7.27256667 L79.6805515,7.27256667 Z M103.711555,0.4879 C109.152235,0.675233333 112.783022,1.63156667 115.466357,7.06656667 C120.383639,17.0275667 111.96692,31.9662333 102.577413,36.0372333 C91.6003746,40.7965667 79.3375086,35.5292333 73.5337832,26.0035667 C70.4607325,20.9595667 68.907205,13.3205667 69.0068841,7.50123333 C69.1345667,0.0739 74.3225485,-0.1321 80.420644,0.0315666667 L103.711555,0.4879 Z'
+              id='Frame'
+            />
+            <path
+              d='M13.1969483,4.9267 C9.78501392,5.11836667 5.88606327,5.16436667 2.69005822,6.63936667 C-0.69461078,8.20136667 -1.2176675,11.7387 3.04920921,12.2260333 C4.97094906,12.4457 6.89488267,12.0827 8.78716336,11.7450333 C10.336903,11.4683667 12.4419791,11.5580333 13.9064752,10.9657 C16.6355213,9.86236667 16.4603333,4.74003333 13.1969483,4.9267'
+              id='Frame'
+            />
+            <path
+              d='M112.73467,4.9267 C116.146606,5.11836667 120.045559,5.16436667 123.241565,6.63936667 C126.626236,8.20136667 127.149293,11.7387 122.882414,12.2260333 C120.960673,12.4457 119.036739,12.0827 117.144457,11.7450333 C115.594717,11.4683667 113.489639,11.5580333 112.025143,10.9657 C109.295782,9.86236667 109.471283,4.74003333 112.73467,4.9267'
+              id='Frame'
+            />
+            <path
+              d='M73.1094302,7.01263333 C71.1631869,4.71263333 66.0912197,3.38463333 62.8914864,3.38463333 C59.6914198,3.38463333 54.7681378,4.71263333 52.8222279,7.01263333 C51.8407719,8.1723 51.8074344,9.72396667 53.5083137,10.4509667 C55.6262451,11.3566333 57.5174814,9.7143 59.2126933,8.8553 C61.3809643,7.75663333 64.7120473,7.8773 66.7189648,8.8553 C68.4271783,9.68796667 70.3050797,11.3566333 72.4233444,10.4509667 C74.1242237,9.72396667 74.0908862,8.1723 73.1094302,7.01263333'
+              id='Frame'
+            />
+          </g>
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Wayfarers.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Wayfarers.tsx
new file mode 100644
index 000000000..2fbf51f7b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/Wayfarers.tsx
@@ -0,0 +1,122 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+export default class Wayfarers extends React.Component {
+  static optionValue = 'Wayfarers'
+
+  private path1 = uniqueId('react-path-')
+  private path2 = uniqueId('react-path-')
+  private filter1 = uniqueId('react-filter-')
+  private linearGradient1 = uniqueId('react-linear-gradient-')
+
+  render () {
+    const { path1, path2, filter1, linearGradient1 } = this
+    return (
+      <g
+        id='Top/_Resources/Wayfarers'
+        fill='none'
+        transform='translate(62.000000, 85.000000)'
+        strokeWidth='1'>
+        <defs>
+          <filter
+            x='-0.8%'
+            y='-2.4%'
+            width='101.6%'
+            height='109.8%'
+            filterUnits='objectBoundingBox'
+            id={filter1}>
+            <feOffset
+              dx='0'
+              dy='2'
+              in='SourceAlpha'
+              result='shadowOffsetOuter1'
+            />
+            <feColorMatrix
+              values='0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.2 0'
+              type='matrix'
+              in='shadowOffsetOuter1'
+              result='shadowMatrixOuter1'
+            />
+            <feMerge>
+              <feMergeNode in='shadowMatrixOuter1' />
+              <feMergeNode in='SourceGraphic' />
+            </feMerge>
+          </filter>
+          <linearGradient
+            x1='50%'
+            y1='0%'
+            x2='50%'
+            y2='100%'
+            id={linearGradient1}>
+            <stop stopColor='#FFFFFF' stopOpacity='0.5' offset='0%' />
+            <stop stopColor='#000000' stopOpacity='0.5' offset='70.5058195%' />
+          </linearGradient>
+          <path
+            d='M44.9178864,17.5714286 C44.9178864,27.2737857 36.66775,35.1428571 22.9204545,35.1428571 L20.1704091,35.1428571 C6.42311364,35.1428571 0.923022727,27.2708571 0.923022727,17.5714286 L0.923022727,17.5714286 C0.923022727,7.86614286 2.20715909,0 21.4545455,0 L24.3863636,0 C43.63375,0 44.9178864,7.86614286 44.9178864,17.5714286 L44.9178864,17.5714286 Z'
+            id={path1}
+          />
+          <path
+            d='M106.486068,17.5714286 C106.486068,27.2737857 98.2388636,35.1428571 84.4886364,35.1428571 L81.7385909,35.1428571 C67.9912955,35.1428571 62.4912045,27.2708571 62.4912045,17.5714286 L62.4912045,17.5714286 C62.4912045,7.86614286 63.7753409,0 83.0227273,0 L85.9545455,0 C105.199,0 106.486068,7.86614286 106.486068,17.5714286 L106.486068,17.5714286 Z'
+            id={path2}
+          />
+        </defs>
+        <g
+          id='Wayfarers'
+          filter={`url(#${filter1})`}
+          transform='translate(7.000000, 7.000000)'>
+          <g
+            id='Shades'
+            transform='translate(10.795455, 2.928571)'
+            fillRule='nonzero'>
+            <g id='Shade'>
+              <use
+                fillOpacity='0.700000048'
+                fill='#000000'
+                fillRule='evenodd'
+                xlinkHref={'#' + path1}
+              />
+              <use
+                fill={`url(#${linearGradient1})`}
+                fillRule='evenodd'
+                style={{ mixBlendMode: 'screen' }}
+                xlinkHref={'#' + path1}
+              />
+            </g>
+            <g id='Shade'>
+              <use
+                fillOpacity='0.700000048'
+                fill='#000000'
+                fillRule='evenodd'
+                xlinkHref={'#' + path2}
+              />
+              <use
+                fill={`url(#${linearGradient1})`}
+                fillRule='evenodd'
+                style={{ mixBlendMode: 'screen' }}
+                xlinkHref={'#' + path2}
+              />
+            </g>
+          </g>
+          <path
+            d='M33.7159091,41 L30.9658636,41 C17.0778409,41 8.78665909,33.3359286 8.78665909,20.5 C8.78665909,10.127 10.5985227,0 32.25,0 L35.1818182,0 C56.8332955,0 58.6451591,10.127 58.6451591,20.5 C58.6451591,32.5686429 48.3955227,41 33.7159091,41 Z M32.25,5.85421429 C14.6502955,5.85421429 14.6502955,12.3175714 14.6502955,20.5 C14.6502955,27.1800714 17.4795,35.1428571 30.9658636,35.1428571 L33.7159091,35.1428571 C44.9418409,35.1428571 52.7815227,29.1217143 52.7815227,20.5 C52.7815227,12.3175714 52.7815227,5.85421429 35.1818182,5.85421429 L32.25,5.85421429 Z'
+            id='Left'
+            fill='#252C2F'
+            fillRule='nonzero'
+          />
+          <path
+            d='M95.2840909,41 L92.5340455,41 C78.6460227,41 70.3548409,33.3359286 70.3548409,20.5 C70.3548409,10.127 72.1667045,0 93.8181818,0 L96.75,0 C118.401477,0 120.213341,10.127 120.213341,20.5 C120.213341,32.5686429 109.963705,41 95.2840909,41 Z M93.8181818,5.85421429 C76.2184773,5.85421429 76.2184773,12.3175714 76.2184773,20.5 C76.2184773,27.1800714 79.0506136,35.1428571 92.5340455,35.1428571 L95.2840909,35.1428571 C106.510023,35.1428571 114.349705,29.1217143 114.349705,20.5 C114.349705,12.3175714 114.349705,5.85421429 96.75,5.85421429 L93.8181818,5.85421429 Z'
+            id='Right'
+            fill='#252C2F'
+            fillRule='nonzero'
+          />
+          <path
+            d='M2.93181818,5.85714286 C3.61786364,5.17185714 11.1233182,0 32.25,0 C49.9640455,0 53.7138409,1.88014286 59.3898409,4.72085714 L59.8053162,4.93054903 C60.1999353,5.07314243 62.2179351,5.77419634 64.5784525,5.85128811 C66.7290156,5.75689949 68.5684809,5.16080623 69.1059926,4.96981137 C75.5844654,1.74762081 81.9260118,0 96.75,0 C117.876682,0 125.382136,5.17185714 126.068182,5.85714286 C127.689477,5.85714286 129,7.16621429 129,8.78571429 L129,11.7142857 C129,13.3337857 127.689477,14.6428571 126.068182,14.6428571 C126.068182,14.6428571 120.204545,14.6428571 120.204545,17.5714286 C120.204545,20.5 117.272727,13.3337857 117.272727,11.7142857 L117.272727,8.8618831 C113.697201,7.46243482 107.296654,5.85714286 96.75,5.85714286 C84.9995538,5.85714286 79.1475515,6.98813142 74.1276604,9.10414393 L74.1837955,9.24257143 L71.6878772,10.2500422 L74.1813177,11.2582547 L71.981173,16.6874536 L69.263564,15.5885995 C69.0208516,15.4904597 68.4971539,15.3141463 67.770994,15.1309826 C65.7466083,14.6203594 63.6653786,14.4649153 61.8248214,14.8513001 C61.1495627,14.993056 60.5230576,15.2057795 59.9480988,15.4931011 L57.3260941,16.8033836 L54.7026238,11.5651815 L57.3246285,10.2548989 L57.3310023,10.251716 L54.8191364,9.23671429 L54.8992448,9.03890561 C50.5700368,6.97578666 46.5781927,5.85714286 32.25,5.85714286 C21.7038986,5.85714286 15.3034993,7.46145875 11.7272727,8.86093383 L11.7272727,11.7142857 C11.7272727,13.3337857 8.79545455,20.5 8.79545455,17.5714286 C8.79545455,14.6428571 2.93181818,14.6428571 2.93181818,14.6428571 C1.31345455,14.6428571 0,13.3337857 0,11.7142857 L0,8.78571429 C0,7.16621429 1.31345455,5.85714286 2.93181818,5.85714286 Z'
+            id='Stuff'
+            fill='#252C2F'
+            fillRule='nonzero'
+          />
+        </g>
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/index.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/index.tsx
new file mode 100644
index 000000000..e4e11a754
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/accessories/index.tsx
@@ -0,0 +1,26 @@
+import * as React from 'react'
+
+import Blank from './Blank'
+import Kurt from './Kurt'
+import Prescription01 from './Prescription01'
+import Prescription02 from './Prescription02'
+import Round from './Round'
+import Sunglasses from './Sunglasses'
+import Wayfarers from './Wayfarers'
+import { AccessoriesOption, Selector } from '../../../options'
+
+export default class Accessories extends React.Component {
+  render () {
+    return (
+      <Selector defaultOption={Blank} option={AccessoriesOption}>
+        <Blank />
+        <Kurt />
+        <Prescription01 />
+        <Prescription02 />
+        <Round />
+        <Sunglasses />
+        <Wayfarers />
+      </Selector>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/BeardLight.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/BeardLight.tsx
new file mode 100644
index 000000000..facf8550c
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/BeardLight.tsx
@@ -0,0 +1,37 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import Colors from './Colors'
+
+export default class BeardLight extends React.Component {
+  static optionValue = 'BeardLight'
+
+  private mask1 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, path1 } = this
+    return (
+      <g
+        id='Facial-Hair/Beard-Light'
+        transform='translate(49.000000, 72.000000)'>
+        <defs>
+          <path
+            d='M101.428403,98.1685688 C98.9148372,100.462621 96.23722,101.494309 92.8529444,100.772863 C92.2705777,100.648833 89.8963391,96.2345713 83.9998344,96.2345713 C78.1033297,96.2345713 75.7294253,100.648833 75.1467245,100.772863 C71.7624488,101.494309 69.0848316,100.462621 66.5712661,98.1685688 C61.8461772,93.855604 57.9166219,87.9081858 60.2778299,81.4191814 C61.5083844,78.0369425 63.5097479,74.3237342 67.1506257,73.2459109 C71.0384163,72.0955419 76.4968931,73.2439051 80.4147542,72.4582708 C81.6840664,72.2035248 83.0706538,71.7508657 83.9998344,71 C84.929015,71.7508657 86.3159365,72.2035248 87.5845805,72.4582708 C91.5027758,73.2439051 96.9612525,72.0955419 100.849043,73.2459109 C104.489921,74.3237342 106.491284,78.0369425 107.722173,81.4191814 C110.083381,87.9081858 106.153826,93.855604 101.428403,98.1685688 M140.081033,26 C136.670693,34.4002532 137.987774,44.8580348 137.356666,53.6758724 C136.844038,60.8431942 135.33712,71.5857526 128.972858,76.214531 C125.718361,78.5816138 119.79436,82.5598986 115.54187,81.4501943 C112.614539,80.6863848 112.302182,72.290096 108.455284,69.1469801 C104.09172,65.5823153 98.6429854,64.0160432 93.1491481,64.2578722 C90.7785381,64.3622683 85.9841367,64.3374908 83.9999331,66.1604584 C82.0157295,64.3374908 77.2216647,64.3622683 74.8510547,64.2578722 C69.3568808,64.0160432 63.9081467,65.5823153 59.5445817,69.1469801 C55.6976839,72.290096 55.3856641,80.6863848 52.4583326,81.4501943 C48.2058427,82.5598986 42.2818421,78.5816138 39.0270077,76.214531 C32.6624096,71.5857526 31.1561652,60.8431942 30.642864,53.6758724 C30.0120926,44.8580348 31.3291729,34.4002532 27.9188335,26 C26.2597768,26 27.3540339,42.1288693 27.3540339,42.1288693 L27.3540339,62.4851205 C27.3856735,77.7732046 36.935095,100.655445 58.1080116,109.393004 C63.2861266,111.52982 75.0153111,115 83.9999331,115 C92.9845551,115 104.71374,111.860188 109.891855,109.723371 C131.064771,100.985813 140.614193,77.7732046 140.646169,62.4851205 L140.646169,42.1288693 C140.646169,42.1288693 141.740089,26 140.081033,26'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <use
+          id='Lite-Beard'
+          fill='#331B0C'
+          fillRule='evenodd'
+          xlinkHref={'#' + path1}
+        />
+        <Colors maskID={mask1} />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/BeardMajestic.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/BeardMajestic.tsx
new file mode 100644
index 000000000..1fc81e414
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/BeardMajestic.tsx
@@ -0,0 +1,37 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import Colors from './Colors'
+
+export default class BeardMajestic extends React.Component {
+  static optionValue = 'BeardMajestic'
+
+  private mask1 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, path1 } = this
+    return (
+      <g
+        id='Facial-Hair/Beard-Majestic'
+        transform='translate(49.000000, 72.000000)'>
+        <defs>
+          <path
+            d='M65.1802189,77.7372986 C67.3631845,76.1045334 80.4065113,75.4786511 82.757829,74.0894494 C83.4916461,73.6553857 84.0610723,73.215719 84.4997781,72.7800074 C84.938814,73.215719 85.5085703,73.6553857 86.2423874,74.0894494 C88.593375,75.4786511 101.636702,76.1045334 103.819667,77.7372986 C106.030032,79.3908276 107.643571,83.1846831 107.466966,86.15095 C107.255041,89.7101408 103.361486,98.2028927 93.6723269,99.1811016 C91.5576925,96.8281927 88.2368647,95.3104528 84.4997781,95.3104528 C80.7633517,95.3104528 77.4421938,96.8281927 75.3275594,99.1811016 C65.6387308,98.2028927 61.7451757,89.7101408 61.5332501,86.15095 C61.3566455,83.1846831 62.9701849,79.3908276 65.1802189,77.7372986 M103.141638,94.9063813 C103.142958,94.9057221 103.144609,94.905063 103.145929,94.9047334 C103.144278,94.905063 103.142958,94.9057221 103.141638,94.9063813 M65.8453747,94.9014375 C65.8493359,94.9030855 65.8565982,94.9057221 65.8618798,94.9076997 C65.8565982,94.9057221 65.8509864,94.9034151 65.8453747,94.9014375 M144.86259,55.9853335 C144.47439,50.0303878 143.277769,44.1519058 142.233986,38.2862777 C141.952739,36.7072349 140.423706,26 139.734783,26 C139.502391,35.1094058 138.701893,44.0803858 137.669664,53.1393651 C137.361018,55.8475668 137.037848,58.5564277 136.825262,61.2741874 C136.653609,63.4695546 136.959614,66.1220564 136.427819,68.2455739 C135.749129,70.9524573 132.348087,73.4783984 129.702978,74.410795 C123.102915,76.7373371 117.597802,67.1077689 111.960977,64.2911336 C104.643272,60.6347152 92.0637391,59.7639895 84.5816434,64.5297918 C76.9361472,59.7639895 64.356614,60.6347152 57.0389092,64.2911336 C51.4024147,67.1077689 45.8969708,76.7373371 39.2972383,74.410795 C36.6521296,73.4783984 33.2504268,70.9524573 32.572397,68.2455739 C32.0402723,66.1220564 32.346277,63.4695546 32.174954,61.2741874 C31.9623682,58.5564277 31.6388681,55.8475668 31.3302226,53.1393651 C30.2983232,44.0803858 29.4974953,35.1094058 29.2654335,26 C28.5761802,26 27.0468169,36.7072349 26.7658999,38.2862777 C25.7221169,44.1519058 24.5258266,50.0303878 24.1376265,55.9853335 C23.738533,62.1047422 24.2148704,68.1674622 25.4695887,74.1632765 C26.0687242,77.0277016 26.7685407,79.8756475 27.518863,82.7041478 C28.352701,85.8467429 27.198994,91.9661516 27.5723395,95.1921317 C28.2787581,101.29572 31.1542781,113.199679 34.3833375,118.45096 C35.9440605,120.989096 37.7734867,122.573742 39.816489,124.619148 C41.7825775,126.58809 42.6038717,129.640049 44.7260985,131.73687 C48.6820428,135.645092 54.4456266,137.971304 60.3656788,138.543134 C65.6773527,143.050212 74.505605,146 84.4997781,146 C94.4946114,146 103.322534,143.050212 108.634538,138.543134 C114.55393,137.971304 120.317843,135.645092 124.274118,131.73687 C126.396015,129.640049 127.217309,126.58809 129.183727,124.619148 C131.2264,122.573742 133.055826,120.989096 134.616879,118.45096 C137.845608,113.199679 140.721458,101.29572 141.427547,95.1921317 C141.800892,91.9661516 140.647185,85.8467429 141.481353,82.7041478 C142.231676,79.8756475 142.931162,77.0277016 143.530628,74.1632765 C144.784686,68.1674622 145.261353,62.1047422 144.86259,55.9853335 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <use
+          id='Glorious-Beard'
+          fill='#5E7AA9'
+          fillRule='evenodd'
+          xlinkHref={'#' + path1}
+        />
+        <Colors maskID={mask1} />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/BeardMedium.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/BeardMedium.tsx
new file mode 100644
index 000000000..6fa1feb50
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/BeardMedium.tsx
@@ -0,0 +1,37 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import Colors from './Colors'
+
+export default class BeardMedium extends React.Component {
+  static optionValue = 'BeardMedium'
+
+  private mask1 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, path1 } = this
+    return (
+      <g
+        id='Facial-Hair/Beard-Medium'
+        transform='translate(49.000000, 72.000000)'>
+        <defs>
+          <path
+            d='M105.017591,94.1296214 C101.150441,99.7213834 98.257542,95.9467308 94.1374777,92.8762163 C91.6567227,91.0272796 87.9608129,88.7275108 84.5044337,88.8410391 C81.0477114,88.7275108 77.3518016,91.0272796 74.8710466,92.8762163 C70.7509822,95.9467308 67.8580835,99.7213834 63.9909333,94.1296214 C61.0884259,89.9323547 62.3028943,82.8739117 65.014944,78.9027173 C68.8738581,73.2512381 74.1088724,75.9847769 79.9622738,75.3400279 C81.5538829,75.1648137 83.1526985,74.7228407 84.5044337,74 C85.856169,74.7228407 87.4546414,75.1648137 89.0462504,75.3400279 C94.899995,75.9847769 100.134666,73.2512381 103.993923,78.9027173 C106.70563,82.8739117 107.920098,89.9323547 105.017591,94.1296214 M140.39109,26 C136.966521,40.0748212 135.393023,54.4337754 132.909944,68.6711471 C132.392536,71.6390145 131.826063,74.5963095 131.224594,77.5496398 C131.098329,78.1697764 130.973781,80.4725746 130.362704,80.7643064 C128.511632,81.6484223 124.739149,76.9466834 123.730409,75.8851496 C121.196893,73.219256 118.684993,70.5292442 115.599415,68.437233 C109.364783,64.2102603 102.065485,61.7108818 94.4700836,61.117837 C91.2922091,60.8693859 86.9951134,61.3025234 84.000116,63.1104016 C81.0051185,61.3025234 76.7080229,60.8693859 73.5298053,61.117837 C65.9344039,61.7108818 58.6351055,64.2102603 52.4004739,68.437233 C49.3148957,70.5292442 46.8033387,73.219256 44.2694796,75.8851496 C43.2607395,76.9466834 39.4882573,81.6484223 37.6371849,80.7643064 C37.0261079,80.4725746 36.9015594,78.1697764 36.7752954,77.5496398 C36.1738255,74.5963095 35.6073527,71.6390145 35.0899445,68.6711471 C32.6072086,54.4337754 31.0337113,40.0748212 27.6091415,26 C26.6127533,26 25.7385119,44.7478165 25.6273446,46.4945731 C25.174784,53.5889755 24.6463963,60.5254529 25.3216346,67.6261326 C26.485803,79.8749043 27.6993791,95.2339402 37.032627,104.58753 C45.4659003,113.039493 57.7103052,114.806417 68.2713185,120.141327 C69.631059,120.828202 71.4347824,121.676306 73.3798667,122.37111 C75.4289129,123.934171 79.4926946,125 84.1740722,125 C89.0846465,125 93.3155222,123.827456 95.2540874,122.137856 C96.9548781,121.49261 98.5180822,120.752874 99.7285704,120.141327 C110.288776,114.805245 122.533989,113.039493 130.967262,104.58753 C140.30051,95.2339402 141.514086,79.8749043 142.678597,67.6261326 C143.353493,60.5254529 142.825105,53.5889755 142.372887,46.4945731 C142.261377,44.7478165 141.387136,26 140.39109,26 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <use
+          id='Beardness'
+          fill='#252E32'
+          fillRule='evenodd'
+          xlinkHref={'#' + path1}
+        />
+        <Colors maskID={mask1} />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/Blank.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/Blank.tsx
new file mode 100644
index 000000000..2560fb000
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/Blank.tsx
@@ -0,0 +1,9 @@
+import * as React from 'react'
+
+export default class Blank extends React.Component {
+  static optionValue = 'Blank'
+
+  render () {
+    return null
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/Colors.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/Colors.tsx
new file mode 100644
index 000000000..2ee34f126
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/Colors.tsx
@@ -0,0 +1,54 @@
+import * as React from 'react'
+
+import { FacialHairColor, Selector } from '../../../options'
+
+export interface Props {
+  maskID: string
+}
+
+function makeColor (name: string, color: string) {
+  class ColorComponent extends React.Component<Props> {
+    render () {
+      return (
+        <g
+          id='Color/Hair/Brown'
+          mask={`url(#${this.props.maskID})`}
+          fill={color}>
+          <g transform='translate(-32.000000, 0.000000)' id='Color'>
+            <rect x='0' y='0' width='264' height='244' />
+          </g>
+        </g>
+      )
+    }
+  }
+  const anyComponent = ColorComponent as any
+  anyComponent.displayName = name
+  anyComponent.optionValue = name
+  return anyComponent
+}
+
+const Auburn = makeColor('Auburn', '#A55728')
+const Black = makeColor('Black', '#2C1B18')
+const Blonde = makeColor('Blonde', '#B58143')
+const BlondeGolden = makeColor('BlondeGolden', '#D6B370')
+const Brown = makeColor('Brown', '#724133')
+const BrownDark = makeColor('BrownDark', '#4A312C')
+const Platinum = makeColor('Platinum', '#ECDCBF')
+const Red = makeColor('Red', '#C93305')
+
+export default class Colors extends React.Component<Props> {
+  render () {
+    return (
+      <Selector option={FacialHairColor} defaultOption={BrownDark}>
+        <Auburn maskID={this.props.maskID} />
+        <Black maskID={this.props.maskID} />
+        <Blonde maskID={this.props.maskID} />
+        <BlondeGolden maskID={this.props.maskID} />
+        <Brown maskID={this.props.maskID} />
+        <BrownDark maskID={this.props.maskID} />
+        <Platinum maskID={this.props.maskID} />
+        <Red maskID={this.props.maskID} />
+      </Selector>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/MoustacheFancy.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/MoustacheFancy.tsx
new file mode 100644
index 000000000..1c98e4243
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/MoustacheFancy.tsx
@@ -0,0 +1,37 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import Colors from './Colors'
+
+export default class MoustacheFancy extends React.Component {
+  static optionValue = 'MoustacheFancy'
+
+  private mask1 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, path1 } = this
+    return (
+      <g
+        id='Facial-Hair/Moustache-Fancy'
+        transform='translate(49.000000, 72.000000)'>
+        <defs>
+          <path
+            d='M84.0002865,69.2970648 C77.2083681,65.7112456 67.5782013,65.1489138 62.3885276,67.1316942 C56.6144416,69.3374281 51.5052994,75.5829845 42.6388201,72.8283797 C42.2699314,72.7136458 41.9094725,73.0449523 42.0204089,73.408662 C43.3937943,77.9183313 51.0278347,81.0068878 53.6221945,81.1080652 C64.961124,81.549609 74.0949802,72.8302891 84.0002865,72.1614794 C93.9055921,72.8302891 103.03945,81.549609 114.378714,81.1080652 C116.972736,81.0068878 124.607113,77.9183313 125.980498,73.408662 C126.091098,73.0449523 125.730639,72.7136458 125.36175,72.8283797 C116.495271,75.5829845 111.386129,69.3374281 105.612044,67.1316942 C100.422371,65.1489138 90.7922044,65.7112456 84.0002865,69.2970648 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <use
+          id='Moustache-U-a-Question'
+          fill='#28354B'
+          fillRule='evenodd'
+          xlinkHref={'#' + path1}
+        />
+        <Colors maskID={mask1} />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/MoustacheMagnum.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/MoustacheMagnum.tsx
new file mode 100644
index 000000000..f5da9a04e
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/MoustacheMagnum.tsx
@@ -0,0 +1,37 @@
+import * as React from 'react'
+import { uniqueId } from 'lodash'
+
+import Colors from './Colors'
+
+export default class MoustacheMagnum extends React.Component {
+  static optionValue = 'MoustacheMagnum'
+
+  private mask1 = uniqueId('react-mask-')
+  private path1 = uniqueId('react-path-')
+
+  render () {
+    const { mask1, path1 } = this
+    return (
+      <g
+        id='Facial-Hair/Moustache-Magnum'
+        transform='translate(49.000000, 72.000000)'>
+        <defs>
+          <path
+            d='M83.9980103,74.839711 C83.4569991,75.6087366 82.761047,76.2496937 81.949688,76.6891498 C73.0477917,81.5102869 63.8767499,77.3322546 58.8763101,77.6298353 C56.459601,77.7739966 53.3405442,79.4153191 52.2155358,77.6791014 C50.9768736,75.7669804 55.0680827,65.2207224 64.7214121,63.4643353 C71.7310704,62.1893309 81.4972391,63.6024033 83.9980103,66.9380109 C86.4987814,63.6024033 96.2649453,62.1893309 103.274279,63.4643353 C112.927938,65.2207224 117.019147,75.7669804 115.780485,77.6791014 C114.655476,79.4153191 111.53642,77.7739966 109.119711,77.6298353 C104.118941,77.3322546 94.948229,81.5102869 86.0463327,76.6891498 C85.2349736,76.2496937 84.5390216,75.6087366 83.9980103,74.839711 Z'
+            id={path1}
+          />
+        </defs>
+        <mask id={mask1} fill='white'>
+          <use xlinkHref={'#' + path1} />
+        </mask>
+        <use
+          id='Hey...'
+          fill='#28354B'
+          fillRule='evenodd'
+          xlinkHref={'#' + path1}
+        />
+        <Colors maskID={mask1} />
+      </g>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/index.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/index.tsx
new file mode 100644
index 000000000..03c216fb5
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/facialHair/index.tsx
@@ -0,0 +1,24 @@
+import * as React from 'react'
+
+import BeardLight from './BeardLight'
+import BeardMajestic from './BeardMajestic'
+import BeardMedium from './BeardMedium'
+import Blank from './Blank'
+import MoustacheFancy from './MoustacheFancy'
+import MoustacheMagnum from './MoustacheMagnum'
+import { FacialHairOption, Selector } from '../../../options'
+
+export default class FacialHair extends React.Component {
+  render () {
+    return (
+      <Selector option={FacialHairOption} defaultOption={Blank}>
+        <Blank />
+        <BeardMedium />
+        <BeardLight />
+        <BeardMajestic />
+        <MoustacheFancy />
+        <MoustacheMagnum />
+      </Selector>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/index.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/index.tsx
new file mode 100644
index 000000000..92aefc6ee
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/avatar/top/index.tsx
@@ -0,0 +1,86 @@
+import * as React from 'react'
+
+import Eyepatch from './Eyepatch'
+import Hat from './Hat'
+import Hijab from './Hijab'
+import LongHairBigHair from './LongHairBigHair'
+import LongHairBob from './LongHairBob'
+import LongHairBun from './LongHairBun'
+import LongHairCurly from './LongHairCurly'
+import LongHairCurvy from './LongHairCurvy'
+import LongHairDreads from './LongHairDreads'
+import LongHairFrida from './LongHairFrida'
+import LongHairFro from './LongHairFro'
+import LongHairFroBand from './LongHairFroBand'
+import LongHairMiaWallace from './LongHairMiaWallace'
+import LongHairNotTooLong from './LongHairNotTooLong'
+import LongHairShavedSides from './LongHairShavedSides'
+import LongHairStraight from './LongHairStraight'
+import LongHairStraight2 from './LongHairStraight2'
+import LongHairStraightStrand from './LongHairStraightStrand'
+import NoHair from './NoHair'
+import ShortHairDreads01 from './ShortHairDreads01'
+import ShortHairDreads02 from './ShortHairDreads02'
+import ShortHairFrizzle from './ShortHairFrizzle'
+import ShortHairShaggyMullet from './ShortHairShaggyMullet'
+import ShortHairShortCurly from './ShortHairShortCurly'
+import ShortHairShortFlat from './ShortHairShortFlat'
+import ShortHairShortRound from './ShortHairShortRound'
+import ShortHairShortWaved from './ShortHairShortWaved'
+import ShortHairSides from './ShortHairSides'
+import ShortHairTheCaesar from './ShortHairTheCaesar'
+import ShortHairTheCaesarSidePart from './ShortHairTheCaesarSidePart'
+import Turban from './Turban'
+import WinterHat1 from './WinterHat1'
+import WinterHat2 from './WinterHat2'
+import WinterHat3 from './WinterHat3'
+import WinterHat4 from './WinterHat4'
+import { Selector, TopOption } from '../../options'
+
+export default class Top extends React.Component {
+  render () {
+    const { children } = this.props
+    return (
+      <Selector defaultOption={LongHairStraight} option={TopOption}>
+        <NoHair>{children}</NoHair>
+        <Eyepatch>{children}</Eyepatch>
+        <Hat>{children}</Hat>
+        <Hijab>{children}</Hijab>
+        <Turban>{children}</Turban>
+        <WinterHat1>{children}</WinterHat1>
+        <WinterHat2>{children}</WinterHat2>
+        <WinterHat3>{children}</WinterHat3>
+        <WinterHat4>{children}</WinterHat4>
+        <LongHairBigHair>{children}</LongHairBigHair>
+        <LongHairBob>{children}</LongHairBob>
+        <LongHairBun>{children}</LongHairBun>
+        <LongHairCurly>{children}</LongHairCurly>
+        <LongHairCurvy>{children}</LongHairCurvy>
+        <LongHairDreads>{children}</LongHairDreads>
+        <LongHairFrida>{children}</LongHairFrida>
+        <LongHairFro>{children}</LongHairFro>
+        <LongHairFroBand>{children}</LongHairFroBand>
+        <LongHairNotTooLong>{children}</LongHairNotTooLong>
+        <LongHairShavedSides>{children}</LongHairShavedSides>
+        <LongHairMiaWallace>{children}</LongHairMiaWallace>
+        <LongHairStraight>{children}</LongHairStraight>
+        <LongHairStraight2>{children}</LongHairStraight2>
+        <LongHairStraightStrand>{children}</LongHairStraightStrand>
+        <ShortHairDreads01>{children}</ShortHairDreads01>
+        <ShortHairDreads02>{children}</ShortHairDreads02>
+        <ShortHairFrizzle>{children}</ShortHairFrizzle>
+        {/*
+        XXX: broken, fix it later
+        <ShortHairShaggy>{children}</ShortHairShaggy>*/}
+        <ShortHairShaggyMullet>{children}</ShortHairShaggyMullet>
+        <ShortHairShortCurly>{children}</ShortHairShortCurly>
+        <ShortHairShortFlat>{children}</ShortHairShortFlat>
+        <ShortHairShortRound>{children}</ShortHairShortRound>
+        <ShortHairShortWaved>{children}</ShortHairShortWaved>
+        <ShortHairSides>{children}</ShortHairSides>
+        <ShortHairTheCaesar>{children}</ShortHairTheCaesar>
+        <ShortHairTheCaesarSidePart>{children}</ShortHairTheCaesarSidePart>
+      </Selector>
+    )
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/index.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/index.tsx
new file mode 100644
index 000000000..bc879983f
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/index.tsx
@@ -0,0 +1,101 @@
+import * as PropTypes from 'prop-types'
+import * as React from 'react'
+
+import Avatar, { AvatarStyle } from './avatar'
+import { OptionContext, allOptions } from './options'
+
+export { default as Avatar, AvatarStyle } from './avatar'
+export { Option, OptionContext, allOptions } from './options'
+
+import {default as PieceComponent} from './avatar/piece';
+
+export interface Props {
+  avatarStyle: string
+  style?: React.CSSProperties
+  topType?: string
+  accessoriesType?: string
+  hairColor?: string
+  facialHairType?: string
+  facialHairColor?: string
+  clotheType?: string
+  clotheColor?: string
+  graphicType?: string
+  eyeType?: string
+  eyebrowType?: string
+  mouthType?: string
+  skinColor?: string
+  pieceType?:string
+  pieceSize?:string
+}
+
+export default class AvatarComponent extends React.Component<Props> {
+  static childContextTypes = {
+    optionContext: PropTypes.instanceOf(OptionContext)
+  }
+  private optionContext: OptionContext = new OptionContext(allOptions)
+
+  getChildContext () {
+    return { optionContext: this.optionContext }
+  }
+
+  componentWillMount () {
+    this.updateOptionContext(this.props)
+  }
+
+  componentWillReceiveProps (nextProps: Props) {
+    this.updateOptionContext(nextProps)
+  }
+
+  render () {
+    const { avatarStyle, style } = this.props
+    return <Avatar avatarStyle={avatarStyle as AvatarStyle} style={style} />
+  }
+
+  private updateOptionContext (props: Props) {
+    const data: { [index: string]: string } = {}
+    for (const option of allOptions) {
+      const value = props[option.key]
+      if (!value) {
+        continue
+      }
+      data[option.key] = value
+    }
+    this.optionContext.setData(data)
+  }
+}
+
+export class Piece extends React.Component<Props> {
+  static childContextTypes = {
+    optionContext: PropTypes.instanceOf(OptionContext)
+  }
+  private optionContext: OptionContext = new OptionContext(allOptions)
+
+  getChildContext () {
+    return { optionContext: this.optionContext }
+  }
+
+  componentWillMount () {
+    this.updateOptionContext(this.props)
+  }
+
+  componentWillReceiveProps (nextProps: Props) {
+    this.updateOptionContext(nextProps)
+  }
+
+  render () {
+    const { avatarStyle, style, pieceType, pieceSize } = this.props
+    return <PieceComponent avatarStyle={avatarStyle as AvatarStyle} style={style} pieceType={pieceType} pieceSize={pieceSize}/>
+  }
+
+  private updateOptionContext (props: Props) {
+    const data: { [index: string]: string } = {}
+    for (const option of allOptions) {
+      const value = props[option.key]
+      if (!value) {
+        continue
+      }
+      data[option.key] = value
+    }
+    this.optionContext.setData(data)
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/options/Option.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/options/Option.ts
new file mode 100644
index 000000000..16585c6f8
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/options/Option.ts
@@ -0,0 +1,17 @@
+export default class Option {
+  private _key: string
+  private _label: string
+
+  get key (): string {
+    return this._key
+  }
+
+  get label (): string {
+    return this._label
+  }
+
+  constructor ({ key, label }: { key: string; label: string }) {
+    this._key = key
+    this._label = label
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/options/OptionContext.ts b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/options/OptionContext.ts
new file mode 100644
index 000000000..a12965dc8
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/options/OptionContext.ts
@@ -0,0 +1,136 @@
+import Option from './Option'
+
+export interface OptionState {
+  key: string
+  options: Array<string>
+  defaultValue?: string
+  available: number
+}
+
+export type OptionContextState = { [index: string]: OptionState }
+
+export default class OptionContext {
+  private stateChangeListeners = new Set<Function>()
+  private valueChangeListeners = new Set<Function>()
+  private _state: OptionContextState = {}
+  private _data: { [index: string]: string } = {}
+  private readonly _options: Array<Option>
+
+  get options () {
+    return this._options
+  }
+
+  get state () {
+    return this._state
+  }
+
+  constructor (options: Array<Option>) {
+    this._options = options
+    for (const option of options) {
+      this._state[option.key] = {
+        key: option.key,
+        available: 0,
+        options: []
+      }
+    }
+  }
+
+  addStateChangeListener (listener: () => void) {
+    this.stateChangeListeners.add(listener)
+  }
+
+  removeStateChangeListener (listener: () => void) {
+    this.stateChangeListeners.delete(listener)
+  }
+
+  addValueChangeListener (listener: (key: string, value: string) => void) {
+    this.valueChangeListeners.add(listener)
+  }
+
+  removeValueChangeListener (listener: (key: string, value: string) => void) {
+    this.valueChangeListeners.delete(listener)
+  }
+
+  optionEnter (key: string) {
+    // TODO:
+    const optionState = this.getOptionState(key)!
+    this.setState({
+      [key]: {
+        ...optionState,
+        available: optionState.available + 1
+      }
+    })
+  }
+
+  optionExit (key: string) {
+    const optionState = this.getOptionState(key)!
+    this.setState({
+      [key]: {
+        ...optionState,
+        available: optionState.available - 1
+      }
+    })
+  }
+
+  getOptionState (key: string): OptionState | null {
+    return this.state[key] || null
+  }
+
+  getValue (key: string): string | null {
+    const optionState = this.getOptionState(key)!
+    if (!optionState) {
+      return null
+    }
+    const value = this._data[key]
+    if (value) {
+      return value
+    }
+    return optionState.defaultValue || null
+  }
+
+  setValue (key: string, value: string) {
+    for (const listener of Array.from(this.valueChangeListeners)) {
+      listener(key, value)
+    }
+  }
+
+  // set single source of truth
+  setData (data: { [index: string]: string }) {
+    this._data = data
+    this.notifyListener()
+  }
+
+  setDefaultValue (key: string, defaultValue: string) {
+    const optionState = this.getOptionState(key)!
+    this.setState({
+      [key]: {
+        ...optionState,
+        defaultValue
+      }
+    })
+  }
+
+  setOptions (key: string, options: Array<string>) {
+    this.setState({
+      [key]: {
+        ...this.state[key],
+        key,
+        options
+      }
+    })
+  }
+
+  private setState (state: OptionContextState) {
+    this._state = {
+      ...this.state,
+      ...state
+    }
+    this.notifyListener()
+  }
+
+  private notifyListener () {
+    for (const listener of Array.from(this.stateChangeListeners)) {
+      listener()
+    }
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/options/Selector.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/options/Selector.tsx
new file mode 100644
index 000000000..6cb8ada17
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/options/Selector.tsx
@@ -0,0 +1,87 @@
+import * as PropTypes from 'prop-types'
+import * as React from 'react'
+
+import Option from './Option'
+import OptionContext from './OptionContext'
+
+function getComponentOptionValue (component: React.ComponentClass) {
+  const optionValue = (component as any).optionValue
+  if (!optionValue) {
+    throw new Error(`optionValue should be provided for ${component}`)
+  }
+  return optionValue
+}
+
+export interface Props {
+  option: Option
+  defaultOption: React.ComponentClass | string
+}
+
+export default class Selector extends React.Component<Props> {
+  static contextTypes = {
+    optionContext: PropTypes.instanceOf(OptionContext)
+  }
+
+  private get optionContext (): OptionContext {
+    return this.context.optionContext
+  }
+
+  componentWillMount () {
+    const { option, defaultOption } = this.props
+    const { optionContext } = this
+    const defaultValue = (
+      typeof defaultOption === 'string' ?
+      defaultOption : getComponentOptionValue(defaultOption)
+    )
+    optionContext.addStateChangeListener(this.optionContextUpdate)
+    optionContext.optionEnter(option.key)
+    const optionState = optionContext.getOptionState(option.key)
+    this.updateOptionValues()
+    if (optionState) {
+      optionContext.setDefaultValue(option.key, defaultValue)
+    }
+  }
+
+  componentWillUpdate (nextProps: Props & { children?: React.ReactNode }) {
+    this.updateOptionValues(nextProps)
+  }
+
+  componentWillUnmount () {
+    this.optionContext.removeStateChangeListener(this.optionContextUpdate)
+    this.optionContext.optionExit(this.props.option.key)
+  }
+
+  render () {
+    let result: React.ReactNode | null = null
+    const { option, children } = this.props
+    const value = this.optionContext.getValue(option.key)!
+    React.Children.forEach(children, child => {
+      if (getComponentOptionValue((child as any).type) === value) {
+        result = child
+      }
+    })
+    return result
+  }
+
+  private optionContextUpdate = () => {
+    this.forceUpdate()
+  }
+
+  private updateOptionValues (
+    nextProps?: Props & { children?: React.ReactNode }
+  ) {
+    if (nextProps && this.props.children === nextProps.children) {
+      return
+    }
+    const { option, children } = this.props
+    const values = React.Children.map(
+      children,
+      // TODO: also validate and throw error if we don't see optionValue
+      child => getComponentOptionValue((child as any).type)
+    )
+    if (new Set(values).size !== values.length) {
+      throw new Error('Duplicate values')
+    }
+    this.optionContext.setOptions(option.key, values)
+  }
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/avataaars/src/options/index.tsx b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/options/index.tsx
new file mode 100644
index 000000000..92c2f6751
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/avataaars/src/options/index.tsx
@@ -0,0 +1,86 @@
+import Option from './Option'
+
+export { default as Option } from './Option'
+export { default as OptionContext, OptionContextState } from './OptionContext'
+export { default as Selector } from './Selector'
+
+export const TopOption = new Option({
+  key: 'topType',
+  label: 'Top',
+})
+
+export const AccessoriesOption = new Option({
+  key: 'accessoriesType',
+  label: '↳ 👓 Accessories',
+})
+
+export const HatColorOption = new Option({
+  key: 'hatColor',
+  label: '🎨 HatColor',
+})
+
+export const HairColorOption = new Option({
+  key: 'hairColor',
+  label: '↳ 💈 Hair Color',
+})
+
+export const FacialHairOption = new Option({
+  key: 'facialHairType',
+  label: 'Facial Hair',
+})
+
+export const FacialHairColor = new Option({
+  key: 'facialHairColor',
+  label: '↳ ✂️ Facial Hair Color',
+})
+
+export const ClotheOption = new Option({
+  key: 'clotheType',
+  label: '👔 Clothes',
+})
+
+export const ClotheColorOption = new Option({
+  key: 'clotheColor',
+  label: '↳ Color Fabric',
+})
+
+export const GraphicOption = new Option({
+  key: 'graphicType',
+  label: '↳ Graphic',
+})
+
+export const EyesOption = new Option({
+  key: 'eyeType',
+  label: '👁 Eyes',
+})
+
+export const EyebrowOption = new Option({
+  key: 'eyebrowType',
+  label: '✏️ Eyebrow',
+})
+
+export const MouthOption = new Option({
+  key: 'mouthType',
+  label: '👄 Mouth',
+})
+
+export const SkinOption = new Option({
+  key: 'skinColor',
+  label: '🎨 Skin',
+})
+
+export const allOptions = [
+  TopOption,
+  AccessoriesOption,
+  HatColorOption,
+  HairColorOption,
+  FacialHairOption,
+  FacialHairColor,
+  ClotheOption,
+  ClotheColorOption,
+  GraphicOption,
+  EyesOption,
+  EyebrowOption,
+  MouthOption,
+  SkinOption,
+]
diff --git a/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/LICENSE b/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/LICENSE
new file mode 100644
index 000000000..3e45f369b
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) [2019] [Kwok Cheong, CHUNG]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/README.md b/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/README.md
new file mode 100644
index 000000000..6f14e34ac
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/README.md
@@ -0,0 +1,93 @@
+# React Native component for Avataaars
+
+A thin wrapper on top of [React component for Avataaars](https://github.com/fangpenlin/avataaars), developed by [Fang-Pen Lin](https://twitter.com/fangpenlin), which is the React component for [Avataaars](https://avataaars.com/). This package allow you to use [React component for Avataaars](https://github.com/fangpenlin/avataaars) in React Native!
+
+<p align="center">
+    <img src="./avataaars.png" alt="avataars" width="250"/>
+</p>
+
+## Features
+
+1. Just like [React component for Avataaars](https://github.com/fangpenlin/avataaars) but can be used in React Native Project
+
+## Usage
+
+```bash
+yarn add react-native-avataaars
+```
+
+or
+
+```bash
+npm install react-native-avataaars --save
+```
+
+```jsx
+...
+import { Avatar } from "react-native-avataaars";
+...
+
+const YourComponent = props => (
+    <Avatar
+        size={300}
+        avatarStyle="Circle"
+        topType="ShortHairShortRound"
+        accessoriesType="Prescription02"
+        hairColor="Black"
+        facialHairType="Blank"
+        clotheType="BlazerShirt"
+        eyeType="Happy"
+        eyebrowType="Default"
+        mouthType="Default"
+        skinColor="Light"
+    />
+)
+```
+
+You may also use the Piece Element.
+
+```jsx
+...
+import { Piece } from "react-native-avataaars";
+...
+
+const YourComponent = props => (
+    <ScrollView>
+        <Piece pieceType="mouth" pieceSize="100" mouthType="Eating" />
+        <Piece pieceType="eyes" pieceSize="100" eyeType="Dizzy" />
+        <Piece
+            pieceType="eyebrows"
+            pieceSize="100"
+            eyebrowType="RaisedExcited"
+        />
+        <Piece
+            pieceType="accessories"
+            pieceSize="100"
+            accessoriesType="Round"
+        />
+        <Piece
+            pieceType="top"
+            pieceSize="100"
+            topType="LongHairFro"
+            hairColor="Red"
+        />
+        <Piece
+            pieceType="facialHair"
+            pieceSize="100"
+            facialHairType="BeardMajestic"
+        />
+        <Piece
+            pieceType="clothe"
+            pieceSize="100"
+            clotheType="Hoodie"
+            clotheColor="Red"
+        />
+        <Piece pieceType="graphics" pieceSize="100" graphicType="Skull" />
+        <Piece pieceType="skin" pieceSize="100" skinColor="Brown" />
+    </ScrollView>
+)
+```
+
+## Credit
+
+Credit to [Fang-Pen Lin](https://twitter.com/fangpenlin) making such amazing package and shout out to [Shiva Nandan](https://github.com/seekshiva), creator of [react-native-remote-svg](https://github.com/seekshiva/react-native-remote-svg). You two make this package possible!
diff --git a/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/avataaars.png b/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/avataaars.png
new file mode 100644
index 000000000..a827ff9b5
Binary files /dev/null and b/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/avataaars.png differ
diff --git a/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/dist/index.js b/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/dist/index.js
new file mode 100644
index 000000000..7d2a21379
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/dist/index.js
@@ -0,0 +1,58 @@
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import * as React from "react";
+import { PixelRatio } from "react-native";
+import ReactDOMServer from "react-dom/server";
+import { default as AvatarReact, Piece as PieceReact } from "./../../avataaars";
+import { SvgXml } from 'react-native-svg';
+var Avatar = (function (_super) {
+    __extends(Avatar, _super);
+    function Avatar() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Avatar.prototype.render = function () {
+        var size = this.props.size;
+        var svgXml = ReactDOMServer.renderToString(React.createElement(AvatarReact, __assign({ style: {
+                width: PixelRatio.getPixelSizeForLayoutSize(size),
+                height: PixelRatio.getPixelSizeForLayoutSize(size)
+            } }, this.props)));
+        return (React.createElement(SvgXml, { xml: svgXml, width: size, height: size }));
+    };
+    return Avatar;
+}(React.Component));
+export { Avatar };
+var Piece = (function (_super) {
+    __extends(Piece, _super);
+    function Piece() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Piece.prototype.render = function () {
+        var pieceSize = this.props.pieceSize;
+        var svgXml = ReactDOMServer.renderToString(React.createElement(PieceReact, __assign({}, this.props)));
+        return (React.createElement(SvgXml, { xml: svgXml, width: Number(pieceSize), height: Number(pieceSize) }));
+    };
+    return Piece;
+}(React.Component));
+export { Piece };
\ No newline at end of file
diff --git a/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/package.json b/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/package.json
new file mode 100644
index 000000000..d2ba8b444
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/package.json
@@ -0,0 +1,63 @@
+{
+  "_from": "react-native-avataaars",
+  "_id": "react-native-avataaars@1.0.2",
+  "_inBundle": false,
+  "_integrity": "sha512-XZWycD+9jHR/hBGtnMD7H3duaH3TYZUiMpIntERZZ91Hr5zAVJjSyJrxbE3vLKBQLyuAdmrge9gtVgb2nHSDRw==",
+  "_location": "/react-native-avataaars",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "react-native-avataaars",
+    "name": "react-native-avataaars",
+    "escapedName": "react-native-avataaars",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/react-native-avataaars/-/react-native-avataaars-1.0.2.tgz",
+  "_shasum": "ab8d2d362ec097841982e4d56374a4c2b24e0ee5",
+  "_spec": "react-native-avataaars",
+  "_where": "D:\\Downloads\\original",
+  "author": {
+    "name": "Tommy Chung",
+    "email": "tom555my@gmail.com"
+  },
+  "bugs": {
+    "url": "https://github.com/tom555my/react-native-avataaars/issues"
+  },
+  "bundleDependencies": false,
+  "dependencies": {
+    "avataaars": "^1.2.1",
+    "react-native-remote-svg": "^1.4.0"
+  },
+  "deprecated": false,
+  "description": "React Native component for Avataaars",
+  "devDependencies": {
+    "@types/react": "^16.7.18",
+    "@types/react-dom": "^16.0.11",
+    "@types/react-native": "^0.57.26",
+    "typescript": "^3.2.2"
+  },
+  "homepage": "https://github.com/tom555my/react-native-avataaars",
+  "keywords": [
+    "react",
+    "native",
+    "react-native",
+    "avataaars",
+    "react-native-avataaars",
+    "avatar"
+  ],
+  "license": "MIT",
+  "main": "dist/index.js",
+  "name": "react-native-avataaars",
+  "repository": {
+    "url": "git+https://github.com/tom555my/react-native-avataaars.git",
+    "type": "git"
+  },
+  "version": "1.0.2"
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/src/index.tsx b/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/src/index.tsx
new file mode 100644
index 000000000..8afa78872
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/src/index.tsx
@@ -0,0 +1,72 @@
+import * as React from "react";
+import { PixelRatio } from "react-native";
+import ReactDOMServer from "react-dom/server";
+import Image from "react-native-remote-svg";
+import { default as AvatarReact, Piece as PieceReact } from "avataaars";
+
+export interface Props {
+	avatarStyle: string;
+	size: number;
+	topType?: string;
+	accessoriesType?: string;
+	hairColor?: string;
+	facialHairType?: string;
+	facialHairColor?: string;
+	clotheType?: string;
+	clotheColor?: string;
+	graphicType?: string;
+	eyeType?: string;
+	eyebrowType?: string;
+	mouthType?: string;
+	skinColor?: string;
+	pieceType?: string;
+	pieceSize?: string;
+}
+
+export class Avatar extends React.Component<Props> {
+	render() {
+		const { size } = this.props;
+		return (
+			<Image
+				source={{
+					uri: `data:image/svg+xml;utf8,${ReactDOMServer.renderToString(
+						<AvatarReact
+							style={{
+								width: PixelRatio.getPixelSizeForLayoutSize(
+									size
+								),
+								height: PixelRatio.getPixelSizeForLayoutSize(
+									size
+								)
+							}}
+							{...this.props}
+						/>
+					)}`
+				}}
+				style={{
+					width: size,
+					height: size
+				}}
+			/>
+		);
+	}
+}
+
+export class Piece extends React.Component<Props> {
+	render() {
+		const { pieceSize } = this.props;
+		return (
+			<Image
+				source={{
+					uri: `data:image/svg+xml;utf8,${ReactDOMServer.renderToString(
+						<PieceReact {...this.props} />
+					)}`
+				}}
+				style={{
+					width: Number(pieceSize),
+					height: Number(pieceSize)
+				}}
+			/>
+		);
+	}
+}
diff --git a/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/src/react-native-remote-svg.d.ts b/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/src/react-native-remote-svg.d.ts
new file mode 100644
index 000000000..1ab200156
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/src/react-native-remote-svg.d.ts
@@ -0,0 +1 @@
+declare module "react-native-remote-svg";
diff --git a/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/tsconfig.json b/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/tsconfig.json
new file mode 100644
index 000000000..b281ecbe3
--- /dev/null
+++ b/src/components/Glutenbuddy/avataaars-lib/react-native-avataaars/tsconfig.json
@@ -0,0 +1,74 @@
+{
+    "compilerOptions": {
+        /* Basic Options */
+        "target": "es5",
+        /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
+        "module": "es2015",
+        /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+        "lib": ["es2017"],
+        /* Specify library files to be included in the compilation. */
+        // "allowJs": true,                       /* Allow javascript files to be compiled. */
+        // "checkJs": true,                       /* Report errors in .js files. */
+        "jsx": "react",
+        /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+        // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+        // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+        // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+        // "outFile": "./",                       /* Concatenate and emit output to single file. */
+        "outDir": "./dist",
+        /* Redirect output structure to the directory. */
+        "rootDir": "./src",
+        /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+        // "composite": true,                     /* Enable project compilation */
+        "removeComments": true,
+        /* Do not emit comments to output. */
+        // "noEmit": true,
+        /* Do not emit outputs. */
+        // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+        // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+        // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+        /* Strict Type-Checking Options */
+        "strict": true,
+        /* Enable all strict type-checking options. */
+        // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+        // "strictNullChecks": true,              /* Enable strict null checks. */
+        // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+        // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+        // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
+        // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+        // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+
+        /* Additional Checks */
+        // "noUnusedLocals": true,                /* Report errors on unused locals. */
+        // "noUnusedParameters": true,            /* Report errors on unused parameters. */
+        // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+        // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+        /* Module Resolution Options */
+        "moduleResolution": "node",
+        /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+        // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+        // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+        // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+        // "typeRoots": [],                       /* List of folders to include type definitions from. */
+        // "types": [],                           /* Type declaration files to be included in compilation. */
+        "allowSyntheticDefaultImports": true,
+        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+        "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+        // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+
+        /* Source Map Options */
+        // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+        // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+        // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+        // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+        /* Experimental Options */
+        // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+        // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+    },
+    "exclude": [
+        "node_modules"
+    ]
+}
\ No newline at end of file
diff --git a/src/components/Glutenbuddy/screens/Achievements.js b/src/components/Glutenbuddy/screens/Achievements.js
new file mode 100644
index 000000000..612c49e3f
--- /dev/null
+++ b/src/components/Glutenbuddy/screens/Achievements.js
@@ -0,0 +1,96 @@
+import React, { Component } from 'react';
+import { StyleSheet, Text, View, FlatList } from 'react-native';
+//import { NavigationContainer } from '@react-navigation/native';
+//import { createStackNavigator } from '@react-navigation/stack';
+import Icon from 'react-native-vector-icons/MaterialIcons';
+import AchievementRecordManager from '../../../manager/buddyManager/AchievementRecordManager';
+//import BackToHomeScreenButton from '../BackToHomeScreenButton';
+import { NavigationEvents } from 'react-navigation';
+import CeliLogger from '../../../analytics/analyticsManager';
+
+
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#d1dfed',
+    alignItems: 'flex-start',
+    justifyContent: 'flex-start',
+  },
+  item: {
+    padding: 10,
+  },
+  text: {
+    fontSize: 20
+  },
+  icon: {
+    fontSize: 30
+  }
+
+});
+
+
+function Item( {item} ){
+  return (
+    <View style={styles.item}>
+      <Text style={styles.text}><Icon name={item.icon} style={styles.icon}></Icon>  {item.count} {item.name}</Text>
+    </View>
+  )
+}
+
+export default class Achievements extends Component{
+    static navigationOptions = ({ navigation }) => ({
+      title: "Achievements",
+    });
+    state = {
+      achievementrecords: null
+    }
+
+    componentWillMount() {
+      CeliLogger.addLog(this.constructor.name, "opened");
+    }
+  
+    // Wird aufgerufen nach instanzieren => Normalerweise nur einmal!
+    // Navigator instanziert komponente aus irgendeinem grund jedesmal neu
+    async componentDidMount() {
+      await this.updateAchievementRecords();
+    }
+
+    componentWillUnmount() {
+      CeliLogger.addLog(this.constructor.name, "closed");
+    }
+
+    render(){
+        if(this.state.achievementrecords == null){
+          return (
+            <View style={styles.container}>
+              <Text>Loading...</Text>
+            </View>
+          )
+        } else {
+          return (
+            <View style={styles.container}>
+              <FlatList
+                data={this.state.achievementrecords}
+                renderItem={( {item} ) => <Item item={item} />}
+                keyExtractor={item => item.id}
+              />
+            </View>
+          )
+        }
+
+    }
+    async updateAchievementRecords(){
+      var achievementrecords = require('../../../config/achievementRecords.json').achievementrecords;
+      var i = 0;
+      while(i < achievementrecords.length){
+        var count = await AchievementRecordManager.getCountForAchievementRecord(achievementrecords[i].id);
+        achievementrecords[i].count = count;
+        i += 1;
+      }
+      await this.setState({achievementrecords : achievementrecords});
+      this.forceUpdate();
+    }
+}
+
+
diff --git a/src/components/Glutenbuddy/screens/AvatarItemPickerMain.js b/src/components/Glutenbuddy/screens/AvatarItemPickerMain.js
new file mode 100644
index 000000000..942d0ff7d
--- /dev/null
+++ b/src/components/Glutenbuddy/screens/AvatarItemPickerMain.js
@@ -0,0 +1,23 @@
+import React from 'react';
+//TODO:
+//import { NavigationContainer } from '@react-navigation/native';
+import WardrobeTabCategories from './WardrobeComponents/WardrobeTabCategories';
+
+const AvatarItemPickerMain = () => {
+  return (
+    <NavigationContainer independent={true}>
+      <WardrobeTabCategories ></WardrobeTabCategories>
+    </NavigationContainer>
+  );
+}
+
+/*
+const styles = StyleSheet.create({
+  container: {
+    flex: 1, 
+    //alignItems: 'center', 
+    //justifyContent: 'center',
+    //backgroundColor: 'orange'
+  },
+});
+*/
diff --git a/src/components/Glutenbuddy/screens/Challenges.js b/src/components/Glutenbuddy/screens/Challenges.js
new file mode 100644
index 000000000..a53323b88
--- /dev/null
+++ b/src/components/Glutenbuddy/screens/Challenges.js
@@ -0,0 +1,77 @@
+import React, { Component } from 'react';
+import { StyleSheet, Text, View, Button, AsyncStorage, FlatList } from 'react-native';
+//import { NavigationContainer } from '@react-navigation/native';
+//import { createStackNavigator } from '@react-navigation/stack';
+import AchievementManager from "../../../manager/buddyManager/AchievementManager";
+import Icon from 'react-native-vector-icons/MaterialIcons';
+import CeliLogger from '../../../analytics/analyticsManager';
+
+//import BackToHomeScreenButton from '../BackToHomeScreenButton';
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#e7ffe6',
+    alignItems: 'flex-start',
+    justifyContent: 'flex-start',
+  },
+  item: {
+    padding: 10,
+  },
+  text: {
+    fontSize: 20
+  },
+  icon: {
+    fontSize: 30
+  }
+
+});
+challenges = require('../../../config/achievements.json').achievements;
+iconsource = require('../../../config/achievementRecords.json').achievementrecords;
+function Item({ item }) {
+  return (
+    <View style={styles.item}>
+      <Text style={styles.text}><Icon name={item.icon} style={styles.icon}></Icon>		   {item.challengename} 	-	 {item.points}		points</Text>
+    </View>
+  )
+}
+
+export default class Challenges extends Component {
+  static navigationOptions = ({ navigation }) => ({
+    title: "Challenges",
+  });
+
+  componentWillMount() {
+    CeliLogger.addLog(this.constructor.name, "opened");
+  }
+
+  componentWillUnmount() {
+    CeliLogger.addLog(this.constructor.name, "closed");
+  }
+
+  render() {
+    var i = 0;
+    while (i < challenges.length) {
+      var icon = iconsource.find(element => element.id == challenges[i].id);
+      if (icon == undefined) {
+        challenges[i].icon = "restaurant";
+      } else {
+        challenges[i].icon = icon.icon;
+      }
+      i += 1;
+    }
+    return (
+      <View style={styles.container}>
+        <FlatList
+          data={challenges}
+          renderItem={({ item }) => <Item item={item} />}
+          keyExtractor={item => item.id}
+        />
+
+      </View>
+    )
+  }
+
+}
+
+
diff --git a/src/components/Glutenbuddy/screens/ChallengesTest.js b/src/components/Glutenbuddy/screens/ChallengesTest.js
new file mode 100644
index 000000000..7646c1007
--- /dev/null
+++ b/src/components/Glutenbuddy/screens/ChallengesTest.js
@@ -0,0 +1,60 @@
+import React, { Component } from 'react';
+import { StyleSheet, Text, View, Button, AsyncStorage } from 'react-native';
+//import { NavigationContainer } from '@react-navigation/native';
+//import { createStackNavigator } from '@react-navigation/stack';
+import AchievementManager from "../../../manager/buddyManager/AchievementManager";
+import AchievementRecordManager from '../../../manager/buddyManager/AchievementRecordManager';
+import EntryManager from "../../../manager/buddyManager/EntryManager";
+
+//import BackToHomeScreenButton from '../BackToHomeScreenButton';
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#fff',
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+
+});
+
+export default class ChallengesTest extends Component{
+  static navigationOptions = ({ navigation }) => ({
+    title: "ChallengesTest",
+  });
+    render(){
+        return (
+            <View style={styles.container}>
+              <Button title="Add glutenfree breakfast - 15 Points" onPress={this.AddMealPress}></Button>
+              <Button title="Add breakfast with gluten - 0 points" onPress={this.AddGlutenMealPress}></Button>
+              <Button title="Add Symptom - 10 Points" onPress={this.AddCalendarPress}></Button>
+              <Button title="Reset points" onPress={this.ResetPress}></Button>
+              <Button title="Check Symptoms Added" onPress={this.CheckSymptomsAdded}></Button>
+              <Button title="Add glutenfree breakfast yesterday" onPress={this.AddGlutenFreeBreakfastYesterday}></Button>
+            </View>
+          )
+    }
+    AddMealPress(){
+     AchievementManager.triggerAchievement('MEALADDED');
+     EntryManager.AddEntry('GLUTENFREEBREAKFAST');
+    }
+    AddCalendarPress(){
+      AchievementManager.triggerAchievement('SYMPTOMADDED');
+      AchievementRecordManager.increaseCountForAchievementRecord('SYMPTOMADDED');
+    }
+    ResetPress(){
+      AsyncStorage.clear();
+    }
+    AddGlutenMealPress(){
+      EntryManager.AddEntry('GLUTENBREAKFAST');
+    }
+    async CheckSymptomsAdded(){
+      await AchievementRecordManager.getCountForAchievementRecord('SYMPTOMADDED');
+    }
+    AddGlutenFreeBreakfastYesterday(){
+      AchievementManager.triggerAchievement('MEALADDED');
+      var yesterday = new Date();
+      yesterday.setDate(yesterday.getDate()-1);
+      EntryManager.AddEntryWithFakeTime('GLUTENFREEBREAKFAST', yesterday);
+    }
+}
diff --git a/src/components/Glutenbuddy/screens/HomeScreenNavButton.js b/src/components/Glutenbuddy/screens/HomeScreenNavButton.js
new file mode 100644
index 000000000..8c074044b
--- /dev/null
+++ b/src/components/Glutenbuddy/screens/HomeScreenNavButton.js
@@ -0,0 +1,50 @@
+// TODEL!
+import React, { Component } from 'react';
+import {StyleSheet, Alert} from 'react-native';
+import ActionButton from 'react-native-action-button';
+import Icon from 'react-native-vector-icons/MaterialIcons';
+
+
+
+
+export default class HomeScreenNavButton extends Component{
+    AlertFunction=()=>{
+        Alert.alert("Currently not available");
+    }
+    render(){
+
+        return (
+            <ActionButton buttonColor="#64B2CA" style={styles.navButton} verticalOrientation="down">
+                <ActionButton.Item title="Achievements" onPress={()=>this.props.navigation.navigate('Achievements')}>
+                    <Icon name="grade" style={styles.actionButtonIcon}></Icon>
+                </ActionButton.Item>
+                <ActionButton.Item title="Challenges" onPress={()=>this.props.navigation.navigate('Challenges')}>
+                    <Icon name="flag" style={styles.actionButtonIcon}></Icon>
+                </ActionButton.Item>
+                <ActionButton.Item title="Wardrobe" onPress={()=>this.props.navigation.navigate('Wardrobe')}>
+                    <Icon name="palette" style={styles.actionButtonIcon}></Icon>
+                </ActionButton.Item>
+                <ActionButton.Item title="Quiz" onPress={this.AlertFunction}> 
+                    <Icon name="help" style={styles.actionButtonIcon}></Icon>
+                </ActionButton.Item>
+                <ActionButton.Item title="ChallengesTest" onPress={()=>this.props.navigation.navigate('ChallengesTest')}> 
+                    <Icon name="build" style={styles.actionButtonIcon}></Icon>
+                </ActionButton.Item>
+            </ActionButton>
+        );
+    }
+
+}
+
+const styles = StyleSheet.create({
+    actionButtonIcon:{
+        fontSize: 20,
+        height: 22,
+        color: 'white',
+        
+    },
+    navButton: {
+        position: 'absolute',
+        right: 300,
+    },
+});
\ No newline at end of file
diff --git a/src/components/Glutenbuddy/screens/Wardrobe.js b/src/components/Glutenbuddy/screens/Wardrobe.js
new file mode 100644
index 000000000..3f6e7f345
--- /dev/null
+++ b/src/components/Glutenbuddy/screens/Wardrobe.js
@@ -0,0 +1,174 @@
+import React from "react";
+import {
+  View,
+  StyleSheet,
+  Image,
+  TouchableOpacity,
+  ImageBackground,
+} from "react-native";
+import InitWardrobeNavigator from "./WardrobeComponents/wardrobeNavigation/InitWardrobeNavigator";
+import { Avatar } from "../avataaars-lib/react-native-avataaars/dist";
+import { observer } from "mobx-react";
+import store from "../../../manager/buddyManager/GlutenBuddyStore";
+import emotionStore from "../../../manager/buddyManager/EmotionStore";
+
+import AchievementManager from "../../../manager/buddyManager/AchievementManager";
+import FlashMessage from "react-native-flash-message";
+import CeliLogger from '../../../analytics/analyticsManager';
+
+@observer
+export default class Wardrobe extends React.Component {
+  static navigationOptions = ({ navigation }) => ({
+    title: "Wardrobe",
+  });
+  constructor(props) {
+    super(props);
+  }
+
+  componentWillMount() {
+    CeliLogger.addLog(this.constructor.name, "opened");
+  }
+
+  componentWillUnmount() {
+    CeliLogger.addLog(this.constructor.name, "closed");
+  }
+
+  onPopupEvent(eventName, index) {
+    if (eventName !== "itemSelected") {
+      return;
+    }
+
+    switch (index) {
+      case 0:
+        this.props.navigation.navigate("Settings");
+        break;
+      // case 1: this.props.navigation.navigate('Camera'); break;
+      case 1:
+        this.props.navigation.navigate("Gear");
+        break;
+      default:
+        this.props.navigation.navigate("Debug");
+        break;
+    }
+  }
+
+  render() {
+    return (
+      <View style={styles.outerView}>
+        <ImageBackground
+          source={require("../../../assets/images/bg_celiac.png")}
+          style={styles.backgroundimage}
+          imageStyle={{ opacity: 0.1 }}
+        >
+          <View style={styles.iconavatargroup}>
+            <TouchableOpacity
+                style={[styles.touchable]}
+                onPress={() => this.props.navigation.navigate("Challenges")}
+              >
+                <Image
+                  style={styles.images}
+                  source={require("../assets/challenges.png")}
+                />
+            </TouchableOpacity>
+            <TouchableOpacity
+            style={styles.touchable}
+            //onPress={() => this.onAvatarClick()}
+            >
+            <Avatar
+              style={styles.avatar}
+              size={store.size}
+              avatarStyle={store.avatarStyle}
+              topType={store.topType}
+              accessoriesType={store.accessoriesType}
+              hairColor={store.hairColor}
+              facialHairType={store.facialHairType}
+              clotheType={store.clotheType}
+              clotheColor={store.clotheColor}
+              eyeType={emotionStore.eyeType}
+              eyebrowType={emotionStore.eyebrowType}
+              mouthType={emotionStore.mouthType}
+              skinColor={store.skinColor}
+            />
+            </TouchableOpacity>
+            <TouchableOpacity
+                style={[styles.touchable]}
+                onPress={() => this.props.navigation.navigate("Achievements")}
+              >
+                <Image
+                  style={styles.images}
+                  source={require("../assets/flag-24px.png")}
+                />
+              </TouchableOpacity>
+            </View>
+        </ImageBackground>
+          <InitWardrobeNavigator
+            style={{
+            flex: 0.5,
+            justifyContent: "center",
+            alignItems: "center",
+            }}>
+          </InitWardrobeNavigator>
+        {/** <MenuButton navigation={this.props.navigation} />*/}
+        <FlashMessage position="bottom" duration={5000} />
+      </View>
+    );
+  }
+  async getCurrentLevel() {
+    AchievementManager.getCurrentLevel();
+  }
+
+  async getDBPoints() {
+    var points = await AchievementManager.getLevelPoints();
+    return points;
+  }
+}
+
+const styles = StyleSheet.create({
+  background: {
+    width: "100%",
+    height: "100%",
+  },
+  popup: {
+    position: "absolute",
+    right: 40,
+    top: 40,
+  },
+  gluton: {
+    //position: 'absolute',
+    top: "25%",
+    //left: '25%',
+    width: "100%",
+    alignItems: "center",
+  },
+  outerView: {
+    flex: 1,
+  },
+  avatar: {
+    flex: 0.3,
+  },
+
+  progressbar: {
+    width: "44%",
+  },
+  touchable: {
+    alignItems: "center",
+    justifyContent: "center",
+    flex: 0.3,
+  },
+  backgroundimage: {
+    resizeMode: "cover",
+    flex: 0.5,
+    //backgroundColor:'rgba(255,0,0,0.5)', //
+    //opacity: 0.5
+  },
+  iconavatargroup: {
+    flex: 1,
+    flexDirection: "row",
+    justifyContent: "space-between",
+    alignItems: "center"
+  },
+  images: {
+    flex: 0.3,
+    resizeMode: "center",
+  },
+});
diff --git a/src/components/Glutenbuddy/screens/WardrobeComponents/OneCategory.js b/src/components/Glutenbuddy/screens/WardrobeComponents/OneCategory.js
new file mode 100644
index 000000000..f6370a262
--- /dev/null
+++ b/src/components/Glutenbuddy/screens/WardrobeComponents/OneCategory.js
@@ -0,0 +1,258 @@
+import React, { Component } from "react";
+import {
+  TouchableOpacity,
+  Alert,
+  ImageBackground,
+  Text,
+  StyleSheet,
+  View,
+} from "react-native";
+import { Piece } from "../../avataaars-lib/react-native-avataaars/dist";
+import styled from "styled-components/native";
+import { observer } from "mobx-react";
+import store from "../../../../manager/buddyManager/GlutenBuddyStore";
+import { showMessage, hideMessage } from "react-native-flash-message";
+import CeliLogger from "../../../../analytics/analyticsManager";
+
+var selectedCategory = "SelectedCategory";
+
+class OneLevel extends Component {
+  constructor(props) {
+    super(props);
+  }
+  render() {
+    const { categoryIndex, slide } = this.props;
+    return (
+      <OneLevelStyles>
+        <Title>{slide.title}</Title>
+        <SlideScroll>
+          {slide.items &&
+            slide.section &&
+            slide.items.map((item, index) => (
+              <OneItem
+                key={index}
+                item={item}
+                categoryIndex={categoryIndex}
+                slide={slide}
+                section={slide.section}
+                sectionId={slide.sectionId}
+              />
+            ))}
+        </SlideScroll>
+      </OneLevelStyles>
+    );
+  }
+}
+
+export default OneLevel;
+
+//OneItem
+@observer
+class OneItem extends Component {
+  constructor(props) {
+    super(props);
+    this.onItemSelected = this.onItemSelected.bind({});
+  }
+
+  render() {
+    const { item, section, sectionId, categoryIndex, slide } = this.props;
+    const unlocked = store.currentLevel >= slide.minLevel;
+    const selected = this.getActiveItem(categoryIndex) === item.id;
+    return (
+      <View>
+        <TouchableOpacity
+          style={
+            unlocked && selected
+              ? styles.oneItemContainerSelected
+              : unlocked
+              ? styles.oneItemContainerUnlocked
+              : styles.oneItemContainerLocked
+          }
+          onPress={() => {
+            var allowed = this.onItemSelected({
+              self: this,
+              id: item.id,
+              sectionId: sectionId,
+              shirtId: item.shirtId,
+              clotheColor: item.clotheColor,
+              glassesId: item.glassesId,
+              skinId: item.skinId,
+              haircutId: item.haircutId,
+              hairColor: item.hairColor,
+              eyeType: "Default",
+              minScore: item.minScore,
+              minLevel: slide.minLevel,
+            });
+          }}
+        >
+          <Piece
+            sectionId={sectionId}
+            pieceType={section}
+            pieceSize="100"
+            eyeType={"Default"}
+            accessoriesType={item.glassesId}
+            topType={item.hairColor ? store.topType : item.haircutId} // if hairColor == null : fill with item.haricutId: else: store.topType
+            hairColor={item.hairColor}
+            clotheType={item.shirtId}
+            clotheColor={item.clotheColor}
+            skinColor={item.skinId}
+          />
+          <ContainerSubtitle>
+            <Text style={unlocked ? styles.textLvlOk : styles.textLvlNotOk}>
+              {item.imgSubtitle}
+            </Text>
+            <SubtitleDescription>{item.imgDescription}</SubtitleDescription>
+          </ContainerSubtitle>
+        </TouchableOpacity>
+      </View>
+    );
+  }
+
+  onItemSelected(obj) {
+    var currentScore = store.score;
+    var currentLevel = store.currentLevel;
+    console.log(currentLevel, "currentlevel");
+    if (currentLevel < obj.minLevel) {
+      var msg =
+        "Your level is (" +
+        (obj.minLevel - currentLevel) +
+        ") too low. Add some entries to unlock this item.";
+      showMessage({
+        message: "Nope",
+        description: msg,
+        type: "warning",
+      });
+      console.log("nope, you cant put this on!");
+      CeliLogger.addLog(selectedCategory, "access denied!, tried putting on objId: " + obj.id);
+      return false;
+    }
+    activeId = obj.id;
+    CeliLogger.addLog(selectedCategory, "access granted, putting on objId: " + obj.id);
+
+    switch (obj.sectionId) {
+      case 1:
+        store.setClotheType(obj.shirtId);
+        store.setClotheColor(obj.clotheColor);
+        store.setActiveClotheTypeId(activeId);
+        CeliLogger.addLog(selectedCategory + " " + obj.sectionId, "new shirtId: " + obj.shirtId + ", color: " + obj.clotheColor);
+        break;
+      case 2:
+        store.setTopType(obj.haircutId);
+        store.setActiveTopTypeId(activeId);
+        CeliLogger.addLog(selectedCategory + " " + obj.sectionId, "new hairstyleId: " + obj.haircutId);
+        break;
+      case 3:
+        store.setAccessoriesType(obj.glassesId);
+        store.setActiveAccessoriesTypeId(activeId);
+        CeliLogger.addLog(selectedCategory + " " + obj.sectionId, "new glassesId: " + obj.glassesId);
+        break;
+      case 4:
+        store.setSkinColor(obj.skinId);
+        store.setActiveSkinColorId(activeId);
+        CeliLogger.addLog(selectedCategory + " " + obj.sectionId, "new skinId: " + obj.skinId);
+        break;
+      case 5:
+        store.setHairColor(obj.hairColor);
+        store.setActiveHairColorId(activeId);
+        CeliLogger.addLog(selectedCategory + " " + obj.sectionId, "new hairColor: " + obj.hairColor);
+        break;
+      case 6:
+        break;
+      default:
+        console.log("something went wrong here in onItemSelected");
+    }
+    return true;
+  }
+
+  // for CSS only:
+  getActiveItem(catIndex) {
+    switch (catIndex) {
+      case 1:
+        return store.activeClotheTypeId;
+      case 2:
+        return store.activeTopTypeId;
+      case 3:
+        return store.activeAccessoriesTypeId;
+      case 4:
+        return store.activeSkinColorId;
+      case 5:
+        return store.activeHairColorId;
+      default:
+        console.log("OneCategory: loading active Items failed!", catIndex);
+    }
+  }
+}
+
+const styles = StyleSheet.create({
+  textLvlOk: {
+    color: "#000",
+    fontWeight: "bold",
+    fontSize: 14, // px
+    padding: 2,
+    backgroundColor: "green",
+    textAlign: "center",
+  },
+  textLvlNotOk: {
+    color: "#000",
+    fontWeight: "bold",
+    fontSize: 14, // px
+    padding: 2,
+    backgroundColor: "grey",
+    textAlign: "center",
+  },
+  oneItemContainerSelected: {
+    width: 100,
+    padding: (0, 0),
+    marginRight: 8,
+    borderWidth: 4,
+    borderRadius: 10,
+    borderColor: "blue",
+    backgroundColor: "#b5d1ff", //, #4db9d6  "#AAF0D1", //  90EE90
+  },
+  oneItemContainerUnlocked: {
+    width: 100,
+    padding: (0, 0),
+    marginRight: 8,
+    borderRadius: 10,
+    backgroundColor: "#b5d1ff", //, #4db9d6  "#AAF0D1", //  90EE90
+  },
+  oneItemContainerLocked: {
+    width: 100,
+    padding: (0, 0),
+    marginRight: 8,
+    borderWidth: 4,
+    borderRadius: 10,
+    borderColor: "grey",
+    backgroundColor: "orange",
+  },
+});
+
+export const OneLevelStyles = styled.View`
+  padding: 0px 20px;
+`;
+
+export const Title = styled.Text`
+  color: #123;
+  font-size: 23px;
+  font-weight: bold;
+`;
+
+export const SlideScroll = styled.ScrollView.attrs({
+  showsHorizontalScrollIndicator: false,
+  horizontal: true,
+})``;
+
+// contains subtitles and descriptions
+export const ContainerSubtitle = styled.View`
+  flex-direction: column;
+  padding: 0px 0px;
+  text-align: center;
+  /* backgroundColor: green; */
+`;
+
+/* beschreibung des items */
+export const SubtitleDescription = styled.Text`
+  color: #888;
+  font-size: 12px;
+  text-align: center;
+`;
diff --git a/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/CategoryImages/glasses.png b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/CategoryImages/glasses.png
new file mode 100644
index 000000000..b775aadad
Binary files /dev/null and b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/CategoryImages/glasses.png differ
diff --git a/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/CategoryImages/haircolor.png b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/CategoryImages/haircolor.png
new file mode 100644
index 000000000..398509fa6
Binary files /dev/null and b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/CategoryImages/haircolor.png differ
diff --git a/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/CategoryImages/haircut.png b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/CategoryImages/haircut.png
new file mode 100644
index 000000000..2ca8cd695
Binary files /dev/null and b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/CategoryImages/haircut.png differ
diff --git a/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/CategoryImages/shirt.png b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/CategoryImages/shirt.png
new file mode 100644
index 000000000..4daa7fdd8
Binary files /dev/null and b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/CategoryImages/shirt.png differ
diff --git a/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/CategoryImages/skincolor1.png b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/CategoryImages/skincolor1.png
new file mode 100644
index 000000000..ac5ca48d3
Binary files /dev/null and b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/CategoryImages/skincolor1.png differ
diff --git a/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategoryEyeColor.js b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategoryEyeColor.js
new file mode 100644
index 000000000..377fe4e49
--- /dev/null
+++ b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategoryEyeColor.js
@@ -0,0 +1,34 @@
+import React from 'react';
+import { View, Text, Button, StyleSheet, Image  } from 'react-native';
+import WardrobeMain from './../WardrobeInitTiles';
+
+const WardrobeCategoryEyeColor = ({navigation}) => {
+    return (
+      <View style={styles.container}>
+        <WardrobeMain category={6}></WardrobeMain>
+      </View>
+    );
+};
+
+export default WardrobeCategoryEyeColor;
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1, 
+    alignItems: 'center', 
+    justifyContent: 'center',
+  },
+});
+
+
+import Icon from 'react-native-vector-icons/Ionicons';
+
+WardrobeCategoryEyeColor.navigationOptions = {
+    tabBarIcon: ({tintColor, focused}) => (
+        <Icon
+            name={focused ? 'ios-planet': 'md-planet'}
+            size={focused ? 28 : 22}
+            color={tintColor}
+            />
+    )
+}
diff --git a/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategoryGlasses.js b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategoryGlasses.js
new file mode 100644
index 000000000..7925c5b0c
--- /dev/null
+++ b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategoryGlasses.js
@@ -0,0 +1,53 @@
+import React from "react";
+import { View, Text, Button, StyleSheet, Image } from "react-native";
+import WardrobeMain from "./../WardrobeInitTiles";
+import CeliLogger from '../../../../../analytics/analyticsManager';
+
+var onTabbarPress = true;
+const WardrobeCategoryGlasses = ({ navigation }) => {
+  // this body is be for tab switches via swipes only!
+  /*this.focusListener = */
+  navigation.addListener("didFocus", () => {
+    if (onTabbarPress === false) {
+      CeliLogger.addLog(navigation.state.routeName, "focussed via swipe");
+    }
+    onTabbarPress = false;
+  });
+    //this.focusListener.remove();
+  
+  return (
+    <View style={styles.container}>
+      <WardrobeMain category={3}></WardrobeMain>
+    </View>
+  );
+};
+
+export default WardrobeCategoryGlasses;
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+});
+
+import Icon from "react-native-vector-icons/Ionicons";
+
+WardrobeCategoryGlasses.navigationOptions = {
+
+  tabBarIcon: ({ tintColor, focused }) => {
+    return (
+      <Image
+        source={require("./CategoryImages/glasses.png")}
+        style={{ height: focused ? 32 : 21, width: focused ? 32 : 21, tintColor: tintColor }}
+      />
+    );
+  },
+  tabBarOnPress: ({ navigation, defaultHandler }) => {
+    onTabbarPress = true;
+    console.log("tabbaronpress")
+    CeliLogger.addLog(navigation.state.routeName, "focussed via tap");
+    defaultHandler()
+  },
+};
diff --git a/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategoryHairColor.js b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategoryHairColor.js
new file mode 100644
index 000000000..f11a633fe
--- /dev/null
+++ b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategoryHairColor.js
@@ -0,0 +1,53 @@
+import React from 'react';
+import { View, Text, Button, StyleSheet, Image } from 'react-native';
+import WardrobeMain from './../WardrobeInitTiles';
+import CeliLogger from '../../../../../analytics/analyticsManager';
+
+var onTabbarPress = true;
+
+const WardrobeCategoryHairColor = ({ navigation }) => {
+  // this body is be for tab switches via swipes only!
+  /*this.focusListener = */
+  navigation.addListener("didFocus", () => {
+  if (onTabbarPress === false) {
+    CeliLogger.addLog(navigation.state.routeName, "focussed via swipe");
+  }
+  onTabbarPress = false;
+});
+  //this.focusListener.remove();
+
+  return (
+    <View style={styles.container}>
+      <WardrobeMain category={5}></WardrobeMain>
+    </View>
+  );
+};
+
+export default WardrobeCategoryHairColor;
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+});
+
+import Icon from 'react-native-vector-icons/Ionicons';
+
+WardrobeCategoryHairColor.navigationOptions = {
+  tabBarIcon: ({ tintColor, focused }) => {
+    return (
+      <Image
+        source={require("./CategoryImages/haircolor.png")}
+        style={{ height: focused ? 32 : 21, width: focused ? 32 : 21, tintColor: tintColor }}
+      />
+    );
+  },
+  tabBarOnPress: ({ navigation, defaultHandler }) => {
+    onTabbarPress = true;
+    console.log("tabbaronpress")
+    CeliLogger.addLog(navigation.state.routeName, "focussed via tap");
+    defaultHandler()
+  },
+};
diff --git a/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategoryHairstyle.js b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategoryHairstyle.js
new file mode 100644
index 000000000..ee9fe4c52
--- /dev/null
+++ b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategoryHairstyle.js
@@ -0,0 +1,53 @@
+import React from 'react';
+import { View, Text, Button, StyleSheet, Image  } from 'react-native';
+import WardrobeInitTiles from './../WardrobeInitTiles';
+import CeliLogger from '../../../../../analytics/analyticsManager';
+
+var onTabbarPress = true;
+const WardrobeCategoryHairstyle = ({navigation}) => {
+  // this body is be for tab switches via swipes only!
+  /*this.focusListener = */
+  navigation.addListener("didFocus", () => {
+    if (onTabbarPress === false) {
+      CeliLogger.addLog(navigation.state.routeName, "focussed via swipe");
+    }
+    onTabbarPress = false;
+  });
+    //this.focusListener.remove();
+  
+    return (
+      <View style={styles.container}>
+        <WardrobeInitTiles category={2}></WardrobeInitTiles>
+      </View>
+    );
+};
+
+export default WardrobeCategoryHairstyle;
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1, 
+    alignItems: 'center', 
+    justifyContent: 'center',
+  },
+});
+
+
+import Icon from 'react-native-vector-icons/Ionicons';
+
+WardrobeCategoryHairstyle.navigationOptions = {
+  tabBarIcon: ({ tintColor, focused }) => {
+    return (
+      <Image
+        source={require("./CategoryImages/haircut.png")}
+        style={{ height: focused ? 32 : 21 , width: focused ? 32 : 21, tintColor: tintColor }}
+      />
+    );
+  },
+  tabBarOnPress: ({ navigation, defaultHandler }) => {
+    onTabbarPress = true;
+    console.log("tabbaronpress")
+    CeliLogger.addLog(navigation.state.routeName, "focussed via tap");
+    defaultHandler()
+  },
+};
diff --git a/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategoryShirt.js b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategoryShirt.js
new file mode 100644
index 000000000..55c681690
--- /dev/null
+++ b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategoryShirt.js
@@ -0,0 +1,55 @@
+import React from 'react';
+import { View, Text, Button, StyleSheet, Image  } from 'react-native';
+import WardrobeInitTiles from './../WardrobeInitTiles';
+import CeliLogger from '../../../../../analytics/analyticsManager';
+
+var onTabbarPress = true;
+const WardrobeCategoryShirt = ({navigation}) => {
+  // this body is be for tab switches via swipes only!
+  /*this.focusListener = */
+  navigation.addListener("didFocus", () => {
+    if (onTabbarPress === false) {
+      CeliLogger.addLog(navigation.state.routeName, "focussed via swipe");
+    }
+    onTabbarPress = false;
+  });
+    //this.focusListener.remove();
+      
+  return (
+      <View style={styles.container}>
+        <WardrobeInitTiles category={1}></WardrobeInitTiles>
+      </View>
+    );
+};
+
+export default WardrobeCategoryShirt;
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1, 
+    alignItems: 'center', 
+    justifyContent: 'center'
+  },
+});
+
+
+
+import Icon from 'react-native-vector-icons/Ionicons';
+
+WardrobeCategoryShirt.navigationOptions = {
+  tabBarIcon: ({ tintColor, focused }) => {
+    return (
+      <Image
+        source={require("./CategoryImages/shirt.png")}
+        style={{ height: focused ? 32 : 21 , width: focused ? 32 : 21, tintColor: tintColor }}
+      />
+    );
+  },
+  tabBarOnPress: ({ navigation, defaultHandler }) => {
+    onTabbarPress = true;
+    console.log("tabbaronpress")
+    CeliLogger.addLog(navigation.state.routeName, "focussed via tap");
+    defaultHandler()
+  },
+};
+
diff --git a/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategorySkinColor.js b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategorySkinColor.js
new file mode 100644
index 000000000..4c7e2d5bf
--- /dev/null
+++ b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeCategories/WardrobeCategorySkinColor.js
@@ -0,0 +1,53 @@
+import React from 'react';
+import { View, Text, Button, StyleSheet, Image  } from 'react-native';
+import WardrobeInitTiles from '../WardrobeInitTiles';
+import CeliLogger from '../../../../../analytics/analyticsManager';
+
+var onTabbarPress = true;
+const WardrobeCategorySkinColor = ({navigation}) => {
+  // this body is be for tab switches via swipes only!
+  /*this.focusListener = */
+  navigation.addListener("didFocus", () => {
+    if (onTabbarPress === false) {
+      CeliLogger.addLog(navigation.state.routeName, "focussed via swipe");
+    }
+    onTabbarPress = false;
+  });
+    //this.focusListener.remove();
+      
+  return (
+      <View style={styles.container}>
+        <WardrobeInitTiles category={4}></WardrobeInitTiles>
+      </View>
+    );
+};
+
+export default WardrobeCategorySkinColor;
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1, 
+    alignItems: 'center', 
+    justifyContent: 'center'
+  },
+});
+
+
+
+import Icon from 'react-native-vector-icons/Ionicons';
+
+WardrobeCategorySkinColor.navigationOptions = {
+  tabBarIcon: ({focused }) => {
+    return (
+      <Image
+        source={require("./CategoryImages/skincolor1.png")}
+        style={{ height: focused ? 32 : 21 , width: focused ? 32 : 21 }}
+      />
+    );
+  },
+  tabBarOnPress: ({ navigation, defaultHandler }) => {
+    onTabbarPress = true;
+    CeliLogger.addLog(navigation.state.routeName, "focussed via tap");
+    defaultHandler()
+  },
+};
diff --git a/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeInitTiles.js b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeInitTiles.js
new file mode 100644
index 000000000..a3cd6d89a
--- /dev/null
+++ b/src/components/Glutenbuddy/screens/WardrobeComponents/WardrobeInitTiles.js
@@ -0,0 +1,69 @@
+import React, { useState, useEffect } from "react";
+import { View } from "react-native";
+import styled from "styled-components/native";
+import OneCategory from "./OneCategory";
+import CeliLogger from '../../../../analytics/analyticsManager';
+
+
+const WardrobeMain = ({ category }) => {
+  const [slides, setSlides] = useState([]);
+
+  const onFetchSlides = async () => {
+    let response = fetchAvatarJson(category);
+    setSlides(response);
+  };
+
+  const fetchAvatarJson = () => {
+    switch (category) {
+      case 1:
+        return require("../../../../config/avatarCategoryItems/categoryShirt.json");
+      case 2:
+        return require("../../../../config/avatarCategoryItems/categoryHaircut.json");
+      case 3:
+        return require("../../../../config/avatarCategoryItems/categoryGlasses.json");
+      case 4:
+        return require("../../../../config/avatarCategoryItems/categorySkinColor.json");
+      case 5:
+        return require("../../../../config/avatarCategoryItems/categoryHairColor.json");
+      default:
+        console.error("WardrobeInitTiles.js: Index not Valid!");
+    }
+  };
+
+  useEffect(() => {
+    //CeliLogger.addLog(this.constructor.name, "opened catg. " + category );
+    onFetchSlides();
+    //return () => {
+      //CeliLogger.addLog(this.constructor.name, "closed");
+    //}
+  }, []);
+  return (
+    <View>
+      <Container>
+        <ContainerScrollView>
+          {slides &&
+            category &&
+            slides.map((slide, index) => (
+              <OneCategory
+                key={index}
+                categoryIndex={category}
+                slide={slide}
+                horizontalContainerIndex={index}
+              />
+            ))}
+        </ContainerScrollView>
+      </Container>
+    </View>
+  );
+};
+export default WardrobeMain;
+
+// actual backgroundColor below tabbar
+export const Container = styled.SafeAreaView`
+  flex: 1;
+  background-color: #f2f2f2;
+`;
+
+export const ContainerScrollView = styled.ScrollView.attrs({
+  showsVerticalScrollIndicator: false,
+})``;
diff --git a/src/components/Glutenbuddy/screens/WardrobeComponents/wardrobeNavigation/InitWardrobeNavigator.js b/src/components/Glutenbuddy/screens/WardrobeComponents/wardrobeNavigation/InitWardrobeNavigator.js
new file mode 100644
index 000000000..7088022bf
--- /dev/null
+++ b/src/components/Glutenbuddy/screens/WardrobeComponents/wardrobeNavigation/InitWardrobeNavigator.js
@@ -0,0 +1,12 @@
+import React, { Component } from "react";
+import { StyleSheet, Text, View } from "react-native";
+import { createAppContainer } from "react-navigation";
+import AppNavigator from "./WardrobeRouter";
+
+const Router = createAppContainer(AppNavigator);
+
+export default () => (
+  <View style={{ flex: 1 }}>
+    <Router />
+  </View>
+);
diff --git a/src/components/Glutenbuddy/screens/WardrobeComponents/wardrobeNavigation/WardrobeRouter.js b/src/components/Glutenbuddy/screens/WardrobeComponents/wardrobeNavigation/WardrobeRouter.js
new file mode 100644
index 000000000..754ba8e6a
--- /dev/null
+++ b/src/components/Glutenbuddy/screens/WardrobeComponents/wardrobeNavigation/WardrobeRouter.js
@@ -0,0 +1,33 @@
+import React from "react";
+import { createMaterialTopTabNavigator } from "react-navigation";
+import { withNavigation } from "react-navigation";
+import WardrobeCategoryShirt from "../WardrobeCategories/WardrobeCategoryShirt";
+import WardrobeCategoryHairColor from "../WardrobeCategories/WardrobeCategoryHairColor";
+import WardrobeCategoryGlasses from "../WardrobeCategories/WardrobeCategoryGlasses";
+import WardrobeCategoryHairstyle from "../WardrobeCategories/WardrobeCategoryHairstyle";
+import WardrobeCategorySkinColor from "../WardrobeCategories/WardrobeCategorySkinColor";
+
+const AppNavigator = createMaterialTopTabNavigator(
+  {
+    CategoryShirt: WardrobeCategoryShirt,
+    CategoryHairColor: WardrobeCategoryHairColor,
+    //CategoryEyeColor: WardrobeCategoryEyeColor,
+    CategoryGlasses: WardrobeCategoryGlasses,
+    CategoryHairstyle: WardrobeCategoryHairstyle,
+    CategorySkinColor: WardrobeCategorySkinColor
+  },
+  {
+    tabBarOptions: {
+      activeTintColor: "white",
+      inactiveTintColor: "tomato",
+      showIcon: true,
+      showLabel: false,
+      style: {
+        backgroundColor: "#4295f5",
+      },
+    },
+    lazy: false,
+  }
+);
+
+export default /*withNavigation*/(AppNavigator);
diff --git a/src/components/Glutenbuddy/web-build/register-service-worker.js b/src/components/Glutenbuddy/web-build/register-service-worker.js
new file mode 100644
index 000000000..888b26046
--- /dev/null
+++ b/src/components/Glutenbuddy/web-build/register-service-worker.js
@@ -0,0 +1,14 @@
+/* eslint-env browser */
+
+if ('serviceWorker' in navigator) {
+  window.addEventListener('load', function() {
+    navigator.serviceWorker
+      .register('/expo-service-worker.js', { scope: '/' })
+      .then(function(info) {
+        // console.info('Registered service-worker', info);
+      })
+      .catch(function(error) {
+        console.info('Failed to register service-worker', error);
+      });
+  });
+}
diff --git a/src/components/Gluton.js b/src/components/Gluton.js
index c2d5fc65c..3f0ee2416 100644
--- a/src/components/Gluton.js
+++ b/src/components/Gluton.js
@@ -66,9 +66,17 @@ export default class Gluton extends React.Component {
                 <NavigationEvents onDidFocus={() => this.refreshState()} />
                 {this.state.message == null ? 
                     null : 
-                    <View style={styles.messageContainer}>
-                        <Text style={styles.message}>{LanguageManager.getInstance().getText(this.state.message, [GlutonManager.getInstance().getBuddy()])}</Text>
-                        <View style={styles.bubbleSeparator} />
+                    <View>
+                      <View style={styles.messageContainer}>
+                          <Text style={styles.message}>
+                            {
+                              LanguageManager.getInstance().getText(
+                              this.state.message,
+                              [GlutonManager.getInstance().getBuddy()])
+                            }
+                          </Text>
+                      </View>
+                      <View style={styles.bubbleSeparator} />
                     </View>
                 }
                 
@@ -77,8 +85,7 @@ export default class Gluton extends React.Component {
                         <Image style={
                             {
                                 width: 284 * this.state.trust, 
-                                height: 360 * this.state.trust,
-                                borderWidth: 1,
+                                height: 360 * this.state.trust
                             }} source={this.state.happy ? Gluton_HAPPY : Gluton_SAD} />
                     </TouchableOpacity>   
                     <Animated.Image source={Gluton_LOVE} style={
@@ -113,12 +120,12 @@ const styles = StyleSheet.create({
         transform: [{ rotate: '45deg'}]
     },
     messageContainer: {
-        width: '80%'
+        width: '80%',
+        backgroundColor: '#fff',
+        borderWidth: 5,
+        borderRadius: 33,
     },
     message: {
-        backgroundColor: '#fff',
-        borderWidth: 5, 
-        borderRadius: 33, 
         textAlignVertical: 'center',
         padding: 10,
         textAlign: 'center',
diff --git a/src/components/HeaderSaveButton.js b/src/components/HeaderSaveButton.js
index b514d1ff9..b6945bd62 100644
--- a/src/components/HeaderSaveButton.js
+++ b/src/components/HeaderSaveButton.js
@@ -2,12 +2,41 @@
 import React from 'react';
 import { TouchableOpacity, StyleSheet } from 'react-native';
 import * as Icon from '@expo/vector-icons';
-import Colors from '../constants/Colors';
 
 export default class HeaderSaveButton extends React.Component{
+
+    constructor(props) {
+        super(props);
+        
+
+        if (this.props.shareConfig)
+        {
+            this.color = '#ddd';
+            this.props.shareConfig.onSymptomsUpdated(this.updateColor.bind(this));
+        } else
+        {
+            this.color = '#000';
+        }
+        this.state = {
+            wasPressed: false
+        };
+    }
+
+    componentWillMount() {
+        this.setState({wasPressed: false});
+    }
+
+    handlePress = () => {
+        this.props.onPress();
+        this.setState({wasPressed: true});
+        setTimeout(() => 
+        {
+            this.setState({wasPressed: false});
+        }, 300);
+    }
+
     render() {
         let iconName = 'md-save';
-
         if (this.props.type == 1) {
             iconName = 'md-checkbox-outline'
         } else if (this.props.type == 2) {
@@ -15,18 +44,26 @@ export default class HeaderSaveButton extends React.Component{
         }
 
         return (
-            <TouchableOpacity style={styles.container} onPress={this.props.onPress}>
-                <Icon.Ionicons name={iconName} size={40} />
+            <TouchableOpacity disabled={this.state.wasPressed} style={this.getStyle()} onPress={this.handlePress}>
+                <Icon.Ionicons name={iconName} size={40} color={this.color}/>
             </TouchableOpacity>
         )
     }
-}
-
-const styles = StyleSheet.create({
-    container: {
-        marginRight: 20,
-        borderWidth: 1,
-        alignItems: 'center',
-        width: 45
-    },
-})
\ No newline at end of file
+
+    getStyle()
+    {
+        return { 
+            marginRight: 20,
+            borderWidth: 1,
+            alignItems: 'center',
+            width: 45,
+            borderColor: this.color
+        }
+    }
+
+    updateColor(isSymptomSelected)
+    {
+        this.color = isSymptomSelected ? '#000' : '#ddd';
+        this.forceUpdate();
+    }
+}
\ No newline at end of file
diff --git a/src/components/MenuButton.js b/src/components/MenuButton.js
index 87bffa311..04839202c 100644
--- a/src/components/MenuButton.js
+++ b/src/components/MenuButton.js
@@ -1,12 +1,28 @@
 import React from 'react';
-import { View, StyleSheet, Alert } from 'react-native';
+import { View, StyleSheet, Image } from 'react-native';
 import ActionButton from 'react-native-action-button';
 import * as Icon from '@expo/vector-icons';
 import LanguageManager from '../manager/LanguageManager';
 
 export default class MenuButton extends React.Component {
+
     constructor(props) {
-      super(props);
+        super(props);
+
+        this.currentDate = null;
+        if (props.shareConfig)
+        {
+            props.shareConfig.onDateChanged(this.onDateChanged.bind(this));
+        }
+
+    }
+
+    onDateChanged(newDate){
+        this.currentDate = newDate;
+    }
+
+    getEventDate(){
+      return !!this.currentDate ? this.currentDate : new Date()
     }
 
     render() {
@@ -19,28 +35,31 @@ export default class MenuButton extends React.Component {
       }
 
       return (
-          <View style={styles.container}>
               <ActionButton buttonColor="rgba(231,76,60,1)">
-                <ActionButton.Item buttonColor='#9b59b6' title={LanguageManager.getInstance().getText("ADD_EMOTION")} onPress={() => this.props.navigation.navigate('AddEmote')}>
+                <ActionButton.Item buttonColor='#00000000' title={LanguageManager.getInstance().getText("ADD_GIP_RESULT")} onPress={() => {this.props.navigation.navigate('AddGIP', {'selectedDateAndTime' : this.getEventDate() }), console.log("first button pressed!!!")}}>
+                  <Image source ={require('../assets/images/GIP_icon.png')}/>
+                </ActionButton.Item>
+                <ActionButton.Item buttonColor='#9b59b6' title={LanguageManager.getInstance().getText("ADD_EMOTION")} onPress={() => this.props.navigation.navigate('AddEmote', {'selectedDateAndTime' : this.getEventDate() })}>
                   <Icon.Ionicons name="md-happy" style={styles.actionButtonIcon} />
                 </ActionButton.Item>
-                <ActionButton.Item buttonColor='#3498db' title={LanguageManager.getInstance().getText("ADD_MEAL")} onPress={() => this.props.navigation.navigate('AddMeal')}>
+            <ActionButton.Item buttonColor='#3498db' title={LanguageManager.getInstance().getText("ADD_MEAL")} onPress={() => this.props.navigation.navigate('AddMeal', {'selectedDateAndTime' : this.getEventDate() })}>
                   <Icon.Ionicons name="md-restaurant" style={styles.actionButtonIcon} />
                 </ActionButton.Item>
-                <ActionButton.Item buttonColor='#1abc9c' title={LanguageManager.getInstance().getText("ADD_SYMPTOM")} onPress={() => this.props.navigation.navigate('AddSymptom')}>
+                <ActionButton.Item buttonColor='#1abc9c' title={LanguageManager.getInstance().getText("ADD_SYMPTOM")} onPress={() => this.props.navigation.navigate('AddSymptom', {'selectedDateAndTime' : this.getEventDate() })}>
                   <Icon.Ionicons name="md-medkit" style={styles.actionButtonIcon} />
                 </ActionButton.Item>
               </ActionButton>                
-          </View>
       );
     }  
 }
 
 const styles = StyleSheet.create({
     container: {
-        width: '100%',
-        height: '100%',
-        position: 'absolute',
+      position: 'absolute',
+      bottom: 75,
+      right: 10,
+      height: 50,
+      width: 200
     },
     actionButtonIcon: {
       fontSize: 35,
diff --git a/src/components/NoteEdit.js b/src/components/NoteEdit.js
index f3cd76f6a..b49f5bfae 100644
--- a/src/components/NoteEdit.js
+++ b/src/components/NoteEdit.js
@@ -1,4 +1,3 @@
-
 import React from 'react';
 import {Text, View, Alert} from 'react-native';
 import TextInputMultiLine from './TextInputMultiLine';
@@ -34,7 +33,12 @@ export default class NoteEdit extends React.Component{
         return(
             <View>
                 <View style={{height: 150}}>
-                     <TextInputMultiLine ref={component => this._textInputMultiLine = component} text = {this.state.note} onTextChanged={this.noteEditedHandled}/>
+                     <TextInputMultiLine
+                        ref={component => this._textInputMultiLine = component}
+                        text = {this.state.note}
+                        onTextChanged={this.noteEditedHandled}
+                        placeholderText={this.props.placeholderText || ""}
+                     />
                 </View>
                 <HorizontalLine/>
             </View>
diff --git a/src/components/ResultDisplay.js b/src/components/ResultDisplay.js
new file mode 100644
index 000000000..43ff27dca
--- /dev/null
+++ b/src/components/ResultDisplay.js
@@ -0,0 +1,111 @@
+import React from 'react'
+import { Text, StyleSheet, View, Image } from 'react-native';
+
+export default class ResultBlock extends React.Component 
+{
+  constructor(props) {
+    super(props);
+    this.state = {
+      resultText: "Result: ",
+      accuracyText: 'Accuracy: ',
+      dateText: 'Date: ',
+      timeText: 'Time: ',
+    };
+  }
+  //../components/ResultDisplay
+  renderImage(){
+    let resultIcon;
+    switch(this.props.dataBlock.resultState) {
+        case 0:
+           resultIcon =  <Image
+            style={{width: 100, height: 100}}
+            source={require('../assets/images/check.png')}/>
+          break;
+        case 1:
+            resultIcon =  <Image
+            style={{width: 100, height: 100}}
+            source={require('../assets/images/cross.png')}/>
+          break;
+        case 2:
+            resultIcon =  <Image
+            style={{width: 100, height: 100}}
+            source={require('../assets/images/question.png')}/>
+           break;
+        default:
+            resultIcon =  <Image
+            style={{width: 100, height: 100}}
+            source={require('../assets/images/question.png')}/>
+      }
+      return resultIcon;
+  }
+
+
+  render() {
+    return (
+        <View style={{
+            height: 110,
+            width: 350,
+            backgroundColor: '#9ADEEF',
+            flexDirection: 'row',
+            padding: 5,
+            }}>
+                
+
+           {this.renderImage()}
+
+            <View style={{
+                flexDirection: 'column',
+                }}>
+
+                <Text style={styles.baseText}>
+                    <Text style={styles.baseText}>
+                        {this.state.resultText}{this.props.dataBlock.resultValue}{'\n'}{'\n'}
+                    </Text>
+
+                    <Text style={styles.baseText}>
+                    {this.state.accuracyText}{this.props.dataBlock.accuracyPercentText}{'% \n'}{'\n'}
+                    </Text>
+
+                    <Text style={styles.baseText}>
+                        {this.state.dateText}{this.props.dataBlock.dateValue}{'\n'}{'\n'}
+                    </Text>
+
+                    <Text style={styles.baseText}>
+                        {this.state.timeText}{this.props.dataBlock.timeValue}{'\n'}{'\n'}
+                    </Text>
+                </Text>
+            </View>
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+    container:{
+
+    },
+  baseText: {
+    paddingLeft: 20,
+    paddingTop: 15,
+    textAlign: 'left',
+    lineHeight: 12,
+    fontSize: 18,
+  },
+  titleText: {
+    fontSize: 20,
+    fontWeight: 'bold',
+  },
+});
+
+
+//Expected Datablock Template
+/**
+ * 
+ * var displayBlock = {
+  resultValue: 20,
+  accuracyPercentText: 2220,
+  dateValue: '12/12/12',
+  timeValue: '12:12',
+  resultState: 3
+}
+ */
\ No newline at end of file
diff --git a/src/components/SymptomTracker/SymptomGroup.js b/src/components/SymptomTracker/SymptomGroup.js
index 33cc6f0e3..734d32d83 100644
--- a/src/components/SymptomTracker/SymptomGroup.js
+++ b/src/components/SymptomTracker/SymptomGroup.js
@@ -2,173 +2,190 @@
 import React from 'react';
 import { StyleSheet, View, ActivityIndicator } from 'react-native';
 import { NavigationEvents } from 'react-navigation';
-import SymptomIconButton from './SymptomIconButton';
+import SymptomIconButton  from './SymptomIconButton';
+import {SYMPTOM_BUTTON_TYPES} from "./SymptomIconButtonConstants.js"
 import DatabaseManager from '../../manager/DatabaseManager';
-
-
-const CLUSTER_SIZE = 4;
-
-export default class SymptomGroup extends React.Component{
-
-    constructor(props) {
-       super(props);
-       this.severityChooserHandler = this.severityChooserHandler.bind(this);
-       this.symptomSelected = this.symptomSelected.bind(this)
-       this.symptomDeselected = this.symptomDeselected.bind(this)
-       this.state = {
-           canOpenSeverityChooser: true,
-           oneVisible: 0,
-           twoVisible: 0,
-           threeVisible: 0,
-           fourVisible: 0,
-           fiveVisible: 0,
-           sixVisible: 0,
-           sevenVisible: 0,
-           eigthVisible: 0,
-           backgroundVisible: -1,
-           symptoms: null,
-           loading: true,
-           showMore: this.props.showMore == null ? false : this.props.showMore,
-       } 
-    }
-
-    refreshSymptoms() {
-        this.setState({ loading: true });
-      
-        DatabaseManager.getInstance().fetchSymptoms(
-            (_, error) => {alert(error)}, 
-            (_, {rows: { _array }}) => this.setState(
-            {
-              symptoms: _array,
-              //error: res.error || null,
-              loading: false,
-            })
-        );
+import CREATE_SYMPTOM_ICON from '../../assets/images/SymptomTracker/addSymptom.png';
+
+const NUM_BUTTONS_IN_ROW = 4;
+
+export default class SymptomGroup extends React.Component {
+
+  constructor(props) {
+    super(props);
+    this.severityChooserHandler = this.severityChooserHandler.bind(this);
+    this.symptomSelected = this.symptomSelected.bind(this)
+    this.symptomDeselected = this.symptomDeselected.bind(this)
+    this.state = {
+      canOpenSeverityChooser: true,
+      oneVisible: 0,
+      twoVisible: 0,
+      threeVisible: 0,
+      fourVisible: 0,
+      fiveVisible: 0,
+      sixVisible: 0,
+      sevenVisible: 0,
+      eigthVisible: 0,
+      backgroundVisible: -1,
+      symptoms: null,
+      loading: true,
+      showMore: this.props.showMore == null ? false : this.props.showMore,
     }
-    
-
-    severityChooserHandler(setActive, symptomID){
-        if(setActive){
-            this.setState({
-                canOpenSeverityChooser: true,
-            });
-        }else{
-            this.setState({
-                canOpenSeverityChooser: false,
-            });
-        }
-
+  }
+
+  noSymptomButton = {
+    id: 0,
+    name: "NO_SYMPTOMS",
+    type: SYMPTOM_BUTTON_TYPES.NO_SYMPTOM,
+    severity: 0,
+    icon: ''
+  }
+
+  addNewSymptomButton = {
+    id: 999,
+    name: "Create Symptom",
+    type: SYMPTOM_BUTTON_TYPES.CREATE_SYMPTOM,
+    icon: CREATE_SYMPTOM_ICON
+  }
+
+  refreshSymptoms() {
+    this.setState({ loading: true });
+
+    DatabaseManager.getInstance().fetchSymptoms(
+      (_, error) => { alert("Error fetching symptoms" + error) },
+      (_, { rows: { _array } }) => {
+
+        _array.unshift(this.noSymptomButton)
+        _array.push(this.addNewSymptomButton)
+
+        this.setState(
+        {
+          symptoms: _array,
+          loading: false,
+        })
+      }
+    );
+  }
+
+  severityChooserHandler(setActive, symptomID) {
+    this.setState({
+      canOpenSeverityChooser: setActive
+    });
+  }
+
+  symptomSelected(symptomID, severity) { //severity: 1==yellow, 2==orange, 3==red
+    let newList = this.props.selection.concat([{ symptomID, severity }]);
+    this.props.onSelectionChanged(newList)
+  }
+
+  symptomDeselected(symptomID, severity) {
+    let newList = this.props.selection.filter((entry => entry.symptomID != symptomID));
+    this.props.onSelectionChanged(newList)
+  }
+
+  getSymptomButtonType = (symptomColumn, type) => {
+    if(!!type)
+      return type;
+    else{
+      switch (symptomColumn){
+        case 0:
+          type = SYMPTOM_BUTTON_TYPES.SEVERITY_CHOOSER_LEFT;
+          break;
+        case 3:
+          type = SYMPTOM_BUTTON_TYPES.SEVERITY_CHOOSER_RIGHT;
+          break;
+        case 1:
+        case 2:
+        default:
+          type = SYMPTOM_BUTTON_TYPES.SEVERITY_CHOOSER_CENTRE
+          break;
+      }
     }
-
-
-    symptomSelected(symptomID, severity){ //severity: 1==yellow, 2==orange, 3==red
-        let newList = this.props.selection.concat([{symptomID, severity}]);
-        this.props.onSelectionChanged(newList)
+    return type;
+  }
+
+  rowOfSymptomButtons(from, size) {
+    let cluster = [];
+    let symptomColumn = 0;
+
+    for (k = from; k < (from + size) && k < this.state.symptoms.length; k++) {
+      symptomColumn = (k % NUM_BUTTONS_IN_ROW);
+
+      let symptom = this.state.symptoms[k];
+      cluster.push(
+        <SymptomIconButton 
+          type={this.getSymptomButtonType(symptomColumn, symptom.type)}
+          key={symptom.id}
+          defaultSeverity={!!symptom.severity ? symptom.severity : 0}
+          symptomID={symptom.id}
+          symptomName={symptom.name}
+          symptomIcon={symptom.icon}
+          onSymptomDeleted={() => this.refreshSymptoms()}
+          onSeverityChooserHandled={this.severityChooserHandler}
+          canOpenSeverity={this.state.canOpenSeverityChooser}
+          onSymptomSelected={this.symptomSelected}
+          onSymptomDeselected={this.symptomDeselected} 
+          navigation={this.props.navigation}
+          />
+      );
     }
 
-
-    symptomDeselected(symptomID, severity){
-        let newList = this.props.selection.filter((entry => entry.symptomID != symptomID));
-        this.props.onSelectionChanged(newList)
+    if (k < (from + size)) {
+      // fill up with spacer
+      while (k++ < (from + size)) {
+        cluster.push(<SymptomIconButton key={k} opacity={0} />);
+      }
     }
 
+    return cluster;
+  }
 
-    groupSymptoms(from, size) {
-        let cluster = [];
-        let symptomPos = 0;
+  renderAllSymptoms() {
+    let symptomRows = [];
 
-        for (k = from; k < (from + size) && k < this.state.symptoms.length; k++) {
-            symptomPos = (k % CLUSTER_SIZE);
-
-            if (symptomPos == 0) {
-                cluster.push(<SymptomIconButton type={1} key={this.state.symptoms[k].id} defaultSeverity={this.getDefaultSeverity(this.state.symptoms[k].id)} symptomID={this.state.symptoms[k].id} symptomName={this.state.symptoms[k].name} symptomIcon={this.state.symptoms[k].icon} onSymptomDeleted={() => this.refreshSymptoms()} onSeverityChooserHandled={this.severityChooserHandler} canOpenSeverity={this.state.canOpenSeverityChooser} onSymptomSelected={this.symptomSelected} onSymptomDeselected={this.symptomDeselected}/>);
-            } else if (symptomPos == 1 || symptomPos == 2) {
-                cluster.push(<SymptomIconButton type={2} key={this.state.symptoms[k].id} defaultSeverity={this.getDefaultSeverity(this.state.symptoms[k].id)} symptomID={this.state.symptoms[k].id} symptomName={this.state.symptoms[k].name} symptomIcon={this.state.symptoms[k].icon} onSymptomDeleted={() => this.refreshSymptoms()} onSeverityChooserHandled={this.severityChooserHandler} canOpenSeverity={this.state.canOpenSeverityChooser} onSymptomSelected={this.symptomSelected} onSymptomDeselected={this.symptomDeselected}/>);
-            } else {
-                cluster.push(<SymptomIconButton type={3} key={this.state.symptoms[k].id} defaultSeverity={this.getDefaultSeverity(this.state.symptoms[k].id)} symptomID={this.state.symptoms[k].id} symptomName={this.state.symptoms[k].name} symptomIcon={this.state.symptoms[k].icon} onSymptomDeleted={() => this.refreshSymptoms()} onSeverityChooserHandled={this.severityChooserHandler} canOpenSeverity={this.state.canOpenSeverityChooser} onSymptomSelected={this.symptomSelected} onSymptomDeselected={this.symptomDeselected}/>);
-            }
-        }
-
-        if (k < (from + size)) {
-            // fill up with spacer
-            while (k++ < (from + size)) {
-                cluster.push(<SymptomIconButton key={k} opacity={0}/>);
-            }
-        }
-
-        return cluster;
+    for (i = 0; i < this.state.symptoms.length; i += NUM_BUTTONS_IN_ROW) {
+      symptomRows.push(
+        <View key={i} style={styles.groupContainer}>{this.rowOfSymptomButtons(i, NUM_BUTTONS_IN_ROW)}</View>)
     }
 
-    renderMoreSymptoms() {
-        let moreList = [];
-
-        for (i = 0; i < this.state.symptoms.length; i += CLUSTER_SIZE) {
-            moreList.push(<View key={i} style={styles.groupContainer}>{this.groupSymptoms(i, CLUSTER_SIZE)}</View>)
-        }
-
-        if (this.state.symptoms.length % CLUSTER_SIZE == 0) {
-            moreList.push(<View key={this.state.symptoms.length} style={styles.groupContainer}>{this.groupSymptoms(this.state.symptoms.length, CLUSTER_SIZE)}</View>)
-        }
-
-        return moreList
-    }
+    return symptomRows
+  }
 
-    getDefaultSeverity(id) {
-        let symptom = this.props.selection.find((entry) => entry.symptomID == id);
-        
-        if (symptom != null) {
-            return symptom.severity;
-        }
+  getDefaultSeverity(id) {
+    let symptom = this.props.selection.find((entry) => entry.symptomID == id);
 
-        return 0;
+    if (symptom != null) {
+      return symptom.severity;
     }
 
-    render() {
-        if (this.state.loading) {
-            return (
-                <View>
-                    <NavigationEvents onDidFocus={() => this.refreshSymptoms()}/>
-                    <ActivityIndicator size='large' color='lightblue' />
-                </View>
-            );
-        } 
-        else if (!this.state.showMore) {
-            return (
-                <View>
-                    <NavigationEvents onDidFocus={() => this.refreshSymptoms()}/>
-                    <View style={{zIndex: 0, marginBottom: 30}}>
-                        <View style={styles.groupContainer}>
-                            <SymptomIconButton type={1} defaultSeverity={this.getDefaultSeverity(this.state.symptoms[0].id)} symptomID={this.state.symptoms[0].id} symptomName={this.state.symptoms[0].name} symptomIcon={this.state.symptoms[0].icon} onSymptomDeleted={() => this.refreshSymptoms()} onSeverityChooserHandled = {this.severityChooserHandler} canOpenSeverity = {this.state.canOpenSeverityChooser} onSymptomSelected = {this.symptomSelected} onSymptomDeselected = {this.symptomDeselected}/>
-                            <SymptomIconButton type={2} defaultSeverity={this.getDefaultSeverity(this.state.symptoms[1].id)} symptomID={this.state.symptoms[1].id} symptomName={this.state.symptoms[1].name} symptomIcon={this.state.symptoms[1].icon} onSymptomDeleted={() => this.refreshSymptoms()} onSeverityChooserHandled = {this.severityChooserHandler} canOpenSeverity = {this.state.canOpenSeverityChooser} onSymptomSelected = {this.symptomSelected} onSymptomDeselected = {this.symptomDeselected}/>
-                            <SymptomIconButton type={2} defaultSeverity={this.getDefaultSeverity(this.state.symptoms[2].id)} symptomID={this.state.symptoms[2].id} symptomName={this.state.symptoms[2].name} symptomIcon={this.state.symptoms[2].icon} onSymptomDeleted={() => this.refreshSymptoms()} onSeverityChooserHandled = {this.severityChooserHandler} canOpenSeverity = {this.state.canOpenSeverityChooser} onSymptomSelected = {this.symptomSelected} onSymptomDeselected = {this.symptomDeselected}/>
-                            <SymptomIconButton type={3} defaultSeverity={this.getDefaultSeverity(this.state.symptoms[3].id)} symptomID={this.state.symptoms[3].id} symptomName={this.state.symptoms[3].name} symptomIcon={this.state.symptoms[3].icon} onSymptomDeleted={() => this.refreshSymptoms()} onSeverityChooserHandled = {this.severityChooserHandler} canOpenSeverity = {this.state.canOpenSeverityChooser} onSymptomSelected = {this.symptomSelected} onSymptomDeselected = {this.symptomDeselected}/>             
-                        </View>
-                        <View style={styles.groupContainer}>
-                            <SymptomIconButton type={1} defaultSeverity={this.getDefaultSeverity(this.state.symptoms[4].id)} symptomID={this.state.symptoms[4].id} symptomName={this.state.symptoms[4].name} symptomIcon={this.state.symptoms[4].icon} onSymptomDeleted={() => this.refreshSymptoms()} onSeverityChooserHandled = {this.severityChooserHandler} canOpenSeverity = {this.state.canOpenSeverityChooser} onSymptomSelected = {this.symptomSelected} onSymptomDeselected = {this.symptomDeselected}/>
-                            <SymptomIconButton type={2} defaultSeverity={this.getDefaultSeverity(this.state.symptoms[5].id)} symptomID={this.state.symptoms[5].id} symptomName={this.state.symptoms[5].name} symptomIcon={this.state.symptoms[5].icon} onSymptomDeleted={() => this.refreshSymptoms()} onSeverityChooserHandled = {this.severityChooserHandler} canOpenSeverity = {this.state.canOpenSeverityChooser} onSymptomSelected = {this.symptomSelected} onSymptomDeselected = {this.symptomDeselected}/>
-                            <SymptomIconButton type={2} defaultSeverity={this.getDefaultSeverity(this.state.symptoms[6].id)} symptomID={this.state.symptoms[6].id} symptomName={this.state.symptoms[6].name} symptomIcon={this.state.symptoms[6].icon} onSymptomDeleted={() => this.refreshSymptoms()} onSeverityChooserHandled = {this.severityChooserHandler} canOpenSeverity = {this.state.canOpenSeverityChooser} onSymptomSelected = {this.symptomSelected} onSymptomDeselected = {this.symptomDeselected}/>
-                            <SymptomIconButton type={4} symptomID={0} symptomName="MORE_SYMPTOMS" symptomIcon={require('../../assets/images/SymptomTracker/moreSymptoms.png')} moreSymptomsParams={{symptoms: this.props.selection, cb: this.props.onSelectionChanged}} onSeverityChooserHandled = {this.severityChooserHandler} canOpenSeverity = {this.state.canOpenSeverityChooser} onSymptomSelected = {this.symptomSelected} onSymptomDeselected = {this.symptomDeselected} navigation={this.props.navigation}/>
-                        </View>
-                    </View>
-                </View>
-            )
-        } else {
-            return (
-                <View>
-                    <NavigationEvents onDidFocus={() => this.refreshSymptoms()}/>
-                    <View style={{zIndex: 0, marginBottom: 30}}>
-                        {this.renderMoreSymptoms()}
-                    </View>
-                </View>
-            )
-        }
+    return 0;
+  }
+
+  render() {
+    if (this.state.loading) {
+      return (
+        <View>
+          <NavigationEvents onDidFocus={() => this.refreshSymptoms()} />
+          <ActivityIndicator size='large' color='lightblue' />
+        </View>
+      );
     }
+    else 
+      return (
+        <View>
+          <NavigationEvents onDidFocus={() => this.refreshSymptoms()} />
+          <View style={{ zIndex: 0, marginBottom: 50 }}>
+            {this.renderAllSymptoms()}
+          </View>
+        </View>
+      )
+  }
 }
 
 const styles = StyleSheet.create({
-    groupContainer: {
-        height: 130,
-        flexDirection: 'row',
-        justifyContent: 'space-around',
-    },
+  groupContainer: {
+    height: 130,
+    flexDirection: 'row',
+    justifyContent: 'space-around',
+  },
 });
\ No newline at end of file
diff --git a/src/components/SymptomTracker/SymptomIconButton.js b/src/components/SymptomTracker/SymptomIconButton.js
index 2b2377513..f90dc459a 100644
--- a/src/components/SymptomTracker/SymptomIconButton.js
+++ b/src/components/SymptomTracker/SymptomIconButton.js
@@ -1,7 +1,10 @@
 import React, { Component } from 'react';
-import { TouchableOpacity, Text, Alert, Animated, Image, Easing, View, StyleSheet } from 'react-native';
+import { TouchableOpacity, Text, Alert, Animated, Image, Easing, View, StyleSheet, Platform } from 'react-native';
 import Dialog from "react-native-dialog";
 
+import Constants from 'expo-constants';
+import {SYMPTOM_BUTTON_TYPES} from "./SymptomIconButtonConstants.js"
+
 // constants
 import {
 	// center,
@@ -10,8 +13,8 @@ import {
 	// topRight,
 	bigBubbleSize,
 	smallBubbleSize,
-  bubbleColorOrange,
-  bubbleColorYellow,
+    bubbleColorOrange,
+    bubbleColorYellow,
 	bubbleColorRed,
 	imageHeight,
 	imageWidth,
@@ -23,8 +26,6 @@ import {
 import LanguageManager from '../../manager/LanguageManager';
 import DatabaseManager from '../../manager/DatabaseManager';
 
-
-
 const AnimatedTouchable = Animated.createAnimatedComponent(TouchableOpacity);
 
 const DEFAULT_COLOR = 'rgb(180, 180, 180)';
@@ -36,17 +37,15 @@ const HIGH_COLOR = 'rgb(255, 0, 0)';
 // other buttons and their animations
 export default class SymptomIconButton extends Component {
 
-	//Prop: type -->  1 == left icon, 2 == normal 3 == right icon. -- Changes the placement of the severity chooser icons around the symptom icon
-	//Prop: type -->  4 == MoreSymptomsButton, 5 CreateSymptomButton
 	//Prop: symptomID --> 1 - 7 --> systemIcons. 0 --> more symptoms button. All IDs higher than that show the userDefinedIcon.
-	
+
 	constructor(props) {
-		super(props);			
-	
+		super(props);
+
 		this.animatedValue = new Animated.Value(0);
 		this.topLeftValue = new Animated.Value(0);
 		this.topCenterValue = new Animated.Value(0);
-		this.topRightValue = new Animated.Value(0);	
+		this.topRightValue = new Animated.Value(0);
 	}
 
 	state = {
@@ -65,18 +64,23 @@ export default class SymptomIconButton extends Component {
 			this.props.onSymptomDeselected(this.props.symptomID, this.state.selectedSeverity);
 		}
 
-		DatabaseManager.getInstance().deleteSymptom(this.props.symptomID, 
-			(error) => {alert(error)}, 
+		DatabaseManager.getInstance().deleteSymptom(this.props.symptomID,
+			(error) => {alert(error)},
 			() => {this.props.onSymptomDeleted()}
 		);
 	};
-	
+
 	handleAddButtonPress = () => {
-		if(this.props.type == 4){
+		if(this.props.type == SYMPTOM_BUTTON_TYPES.MORE_SYMPTOMS){
 			this.props.navigation.navigate("MoreSymptoms", this.props.moreSymptomsParams)
-		}else if (this.props.type == 5) {
+		}else if (this.props.type == SYMPTOM_BUTTON_TYPES.CREATE_SYMPTOM) {
 			this.props.navigation.navigate("AddNewSymptom")
-		}else{
+        }else if (this.props.type == SYMPTOM_BUTTON_TYPES.NO_SYMPTOM)
+        {
+            this.onPressNoSymptoms();
+        }
+        else
+        {
 			if (this.state.selectedSeverity == 0) {
 				this.callAnimation(false);
 			} else {
@@ -97,18 +101,31 @@ export default class SymptomIconButton extends Component {
 			else {
 				if(this.props.canOpenSeverity){
 					this.animate(1);
-					this.setState({zIndexNumber: 1})					
+					this.setState({zIndexNumber: 1})
 					this.props.onSeverityChooserHandled(false, this.props.symptomID);
 					this.setState({selected: !selected});
 				}else{
 					if(setEnabled){
-						//Alert.alert("hallo");
 						this.props.onSeverityChooserHandled(true, this.props.symptomID);
 					}
 				}
-			}	
+			}
 	}
 
+    onPressNoSymptoms()
+    {
+        const { selected } = this.state;
+        this.setState({selected: !selected, selectedSeverity: selected ? 0 : 1});
+        if (selected)
+        {
+            this.props.onSymptomDeselected(this.props.symptomID, 1);
+        }
+        else 
+        {
+            this.props.onSymptomSelected(this.props.symptomID, 1);
+        }
+        this.props.onSeverityChooserHandled(true);
+    }
 
 	onPressYellow = () => {
 		this.setState({selectedSeverity: 1})
@@ -214,7 +231,7 @@ export default class SymptomIconButton extends Component {
 
 		let springValue = Animated.add(Animated.add(this.topLeftValue, this.topRightValue), this.topCenterValue);
 
-		if(this.props.type == 1){
+		if(this.props.type == SYMPTOM_BUTTON_TYPES.SEVERITY_CHOOSER_LEFT){
 			center = {
 				top: 15,
 				left: 15,
@@ -234,7 +251,7 @@ export default class SymptomIconButton extends Component {
 				top: 45,
 				left: 90,
 			};
-		}else if(this.props.type == 2){
+		}else if(this.props.type == SYMPTOM_BUTTON_TYPES.SEVERITY_CHOOSER_CENTRE){
 			center = {
 				top: 15,
 				left: 15,
@@ -254,8 +271,7 @@ export default class SymptomIconButton extends Component {
 				top: -30,
 				left: 85,
 			};
-	
-		}else if(this.props.type == 3){
+		}else if(this.props.type == SYMPTOM_BUTTON_TYPES.SEVERITY_CHOOSER_RIGHT){
 			center = {
 				top: 15,
 				left: 15,
@@ -304,9 +320,16 @@ export default class SymptomIconButton extends Component {
 			case 3: bigBubbleColor= HIGH_COLOR; break;
 		}
 
+		let { selected } = this.state;
+        let zIndex = selected ? 100 : 0;
+        
+        const symptomName = this.props.symptomID != -1 ? this.props.symptomName : 'NO_SYMPTOMS'; //TODO: Temp solution. Needs to be an entry in the database
+        
 		if (this.props.active == null || this.props.active == true) {
 			return (
-				<View style={{marginTop: 60, opacity: this.props.opacity}}>
+				<View style={(Platform.OS === 'ios') ?
+          {marginTop: 60, opacity: this.props.opacity, zIndex: zIndex} :
+          {marginTop: 60, opacity: this.props.opacity}}>
 					<Animated.View
 						style={[
 							style.bigBubble,
@@ -319,7 +342,7 @@ export default class SymptomIconButton extends Component {
 										}),
 									},
 								],
-								backgroundColor: bigBubbleColor,
+								backgroundColor: bigBubbleColor
 							},
 						]}
 					>
@@ -338,7 +361,7 @@ export default class SymptomIconButton extends Component {
 							</Animated.View>
 						</TouchableOpacity>
 					</Animated.View>
-					<Text style={style.symptomNameText}>{LanguageManager.getInstance().getText(this.props.symptomName)}</Text>
+					<Text style={style.symptomNameText}>{LanguageManager.getInstance().getText(symptomName)}</Text>
 					<AnimatedTouchable onPress={this.onPressYellow}
 						style={[
 							style.smallBubbleYellow,
@@ -453,7 +476,7 @@ export default class SymptomIconButton extends Component {
 						<View style={[style.bigBubbleBig, { backgroundColor: bigBubbleColor } ]}>
 							<Image source={Image.resolveAssetSource(this.props.symptomIcon)} style={style.iconImageBig}/>
 						</View>
-						<Text style={style.symptomNameTextBig}>{LanguageManager.getInstance().getText(this.props.symptomName)}</Text>
+						<Text style={style.symptomNameTextBig}>{LanguageManager.getInstance().getText(symptomName)}</Text>
 					</View>
 				);
 			} else {
@@ -462,7 +485,7 @@ export default class SymptomIconButton extends Component {
 						<View style={[style.bigBubble, { backgroundColor: bigBubbleColor } ]}>
 							<Image source={Image.resolveAssetSource(this.props.symptomIcon)} style={style.iconImage}/>
 						</View>
-						<Text style={style.symptomNameText}>{LanguageManager.getInstance().getText(this.props.symptomName)}</Text>
+						<Text style={style.symptomNameText}>{LanguageManager.getInstance().getText(symptomName)}</Text>
 					</View>
 				);
 			}
@@ -493,7 +516,7 @@ const style = StyleSheet.create({
 		alignItems: 'center',
 		backgroundColor: bubbleColorOrange,
 		height: smallBubbleSize,
-		width: smallBubbleSize,		
+		width: smallBubbleSize,
 		borderWidth: 1,
 		borderColor: 'grey',
 		borderRadius: smallBubbleSize / 2,
diff --git a/src/components/SymptomTracker/SymptomIconButtonConstants.js b/src/components/SymptomTracker/SymptomIconButtonConstants.js
index 8b4273bc8..647b1bd98 100644
--- a/src/components/SymptomTracker/SymptomIconButtonConstants.js
+++ b/src/components/SymptomTracker/SymptomIconButtonConstants.js
@@ -38,4 +38,13 @@ export const animateTime = 0;
 // export const easingType = Easing.out(Easing.exp);
 export const easingType = Easing.linear
 export const delay = 0;
+
+export const SYMPTOM_BUTTON_TYPES = {
+	SEVERITY_CHOOSER_LEFT: 1,
+	SEVERITY_CHOOSER_CENTRE: 2,
+	SEVERITY_CHOOSER_RIGHT: 3,
+	MORE_SYMPTOMS: 4,
+	CREATE_SYMPTOM: 5,
+	NO_SYMPTOM: 6
+  };
   
\ No newline at end of file
diff --git a/src/components/TextInputMultiLine.js b/src/components/TextInputMultiLine.js
index acdbe3a73..a9519f3a7 100644
--- a/src/components/TextInputMultiLine.js
+++ b/src/components/TextInputMultiLine.js
@@ -62,6 +62,7 @@ export default class TextFieldMultiline extends React.Component {
                 editable = {true}
                 maxLength = {400}
                 multiline = {true}
+                placeholder={this.props.placeholderText || ""}
             />
         </View>
     );
@@ -81,7 +82,8 @@ const styles = StyleSheet.create({
            borderRadius: 20,
            marginLeft: 10,
            marginRight: 10,
-           alignContent: 'space-around'
+           alignContent: 'space-around',
+           padding: 10
            }
 });
 
diff --git a/src/components/TextInputSingleLine.js b/src/components/TextInputSingleLine.js
index 00204c4d6..764baa296 100644
--- a/src/components/TextInputSingleLine.js
+++ b/src/components/TextInputSingleLine.js
@@ -3,7 +3,6 @@ import { StyleSheet, Text, View, Alert, TextInput } from 'react-native';
 
 export default class TextInputSingleLine extends React.Component {
 
-
     constructor(props) {
         super(props);
         this.state = {text: ''};
@@ -16,21 +15,21 @@ export default class TextInputSingleLine extends React.Component {
           this.props.onTextChanged(t)
       }
 
-
  render() {
       return (
         <View style={{top:10, bottom: 15}}>
             <View style={styles.Text}>
                 <TextInput
-                {...this.props}
-                maxLength = {30}
-                style={{marginRight: 20}}
-                onChangeText={(text) => {this.textChanged(text)}}
-                value={this.props.preText}
+                  {...this.props}
+                  maxLength = {60}
+                  style={{marginRight: 20}}
+                  onChangeText={(text) => {this.textChanged(text)}}
+                  value={this.props.preText}
+                  placeholder={this.props.placeholderText || ""}
                 />
             </View>
         </View>
-        );
+      );
     }
 }
 
@@ -47,6 +46,7 @@ const styles = StyleSheet.create({
             borderRadius: 20,
             marginLeft: 10,
             marginRight: 10,
-            alignContent: 'space-around'
+            alignContent: 'space-around',
+            padding: 10
         }
 });
diff --git a/src/components/UsernameDialog.js b/src/components/UsernameDialog.js
new file mode 100644
index 000000000..5cd18c27b
--- /dev/null
+++ b/src/components/UsernameDialog.js
@@ -0,0 +1,118 @@
+import React from 'react';
+import {
+  Image,
+  View,
+  Dimensions,
+  StyleSheet,
+  Text,
+  TextInput
+} from 'react-native';
+import Dialog from "react-native-dialog";
+
+import { Button } from 'react-native-elements';
+
+import LOGO from '../assets/images/web_hi_res_512.png';
+import { createStyles, maxHeight } from 'react-native-media-queries'; 
+export default class UsernameDialog extends React.Component {
+  constructor(props){
+    super(props);
+    this.state = { username: '' };
+  }
+
+  userNameIsValid = () => !!this.state.username && (this.state.username.length > 3)
+
+  buttonDisabled = () => !this.userNameIsValid()
+
+  updateUsername = (name) => this.setState({username: name})
+
+  componentDidMount(){
+    this.emailInput.focus();
+  }
+
+  render() {
+    return (
+      <View style={{...styles.container,
+                    width: Dimensions.get('window').width,
+                    height: Dimensions.get('window').height}}>
+        <View></View>
+        <Text style={styles.title}>CeliApp</Text>
+        <Image style={styles.logo} source={LOGO} />
+        <View style={styles.container}>
+          <Text>Welcome the 21-day challenge!</Text>
+          <Text>Please provide your email address to get started:</Text>
+          <TextInput
+            ref={(input) => { this.emailInput = input; }}
+            style={styles.emailInput}
+            onChangeText={(text) => this.updateUsername(text)} />
+
+          </View>
+          <Button
+            buttonStyle={styles.button}
+            titleStyle={{ color: 'black' }}
+            title=" Sign Up "
+            type="outline"
+            onPress = { () => this.props.onUsername(this.state.username)}
+                            style = {this.buttonDisabled() ? styles.buttonDisabled : ''}
+                            disabled = {this.buttonDisabled() }
+          />
+          <View></View>
+          <View></View>
+      </View>
+    );
+  }
+}
+
+var base = StyleSheet.create({
+  container: {
+    alignItems: 'center'
+  },
+  title: {
+    marginTop: '10%',
+    marginBottom: 0,
+    fontSize: 32,
+    fontWeight: 'bold',
+  },
+  logo: {
+    width: 200,
+    height: 200,
+    margin: '10%',
+    borderColor: '#000',
+    borderWidth: 1,
+  },
+  emailInput: {
+    width: 300,
+    height: 40,
+    borderColor: 'gray',
+    borderWidth: 1,
+    margin: 10,
+    padding: 5,
+  },
+  button: {
+      backgroundColor: 'white',
+      borderColor: 'black',
+      borderWidth: 1,
+      borderRadius: 2,
+   },
+   buttonDisabled: {
+     color: "gray",
+   },
+ });
+
+ const styles = createStyles(
+    base,
+     maxHeight(700, {
+        title: {
+            marginTop: '6%',
+            marginBottom: 0,
+            fontSize: 20,
+            fontWeight: 'bold',
+          },
+          logo: {
+            width: 100,
+            height: 100,
+            margin: '3%',
+            borderColor: '#000',
+            borderWidth: 1,
+          }
+     })
+ );
\ No newline at end of file
diff --git a/src/config/achievementRecords.json b/src/config/achievementRecords.json
new file mode 100644
index 000000000..836123a57
--- /dev/null
+++ b/src/config/achievementRecords.json
@@ -0,0 +1,13 @@
+{
+    "achievementrecords": [ {
+        "id": "MEALADDED",
+        "name": "Meals added",
+        "icon": "restaurant",
+        "recordtype": "MEAL"
+    },{
+        "id": "SYMPTOMADDED",
+        "name": "Symptoms added",
+        "icon": "healing",
+        "recordtype": "SYMPTOM"
+    }]
+}
\ No newline at end of file
diff --git a/src/config/achievements.json b/src/config/achievements.json
new file mode 100644
index 000000000..2d8a52f5c
--- /dev/null
+++ b/src/config/achievements.json
@@ -0,0 +1,22 @@
+{
+    "achievements": [ {
+        "id": "MEALADDED",
+        "message": "Added Meal",
+        "challengename": "Add a meal",
+        "points": 15,
+        "type": "REPEATABLE"
+    },{
+        "id": "SYMPTOMADDED",
+        "message": "Added Symptom",
+        "challengename": "Add a symptom",
+        "points": 10,
+        "type": "REPEATABLE"
+
+    }, {
+        "id": "10MEALSADDED",
+        "message": "Added 10 Meals",
+        "challengename": "Add 10 Meals",
+        "points": 30,
+        "type": "ONETIME"
+    }]
+}
\ No newline at end of file
diff --git a/src/config/avatarCategoryItems/categoryGlasses.json b/src/config/avatarCategoryItems/categoryGlasses.json
new file mode 100644
index 000000000..a1d1a2b82
--- /dev/null
+++ b/src/config/avatarCategoryItems/categoryGlasses.json
@@ -0,0 +1,75 @@
+[
+  {
+    "sectionId": 3,
+    "title": "Lvl 1",
+    "minLevel": 1,
+    "section": "accessories",
+    "items": [
+      {
+        "id": 30048,
+        "glassesId": "Blank",
+        "minScore": 20,
+        "imgSubtitle": "No Glasses",
+        "imgDescription": ""
+      },
+      {
+        "id": 30049,
+        "glassesId": "Kurt",
+        "minScore": 40,
+        "imgSubtitle": "Kurt",
+        "imgDescription": ""
+      },
+      {
+        "id": 30050,
+        "glassesId": "Prescription01",
+        "minScore": 60,
+        "imgSubtitle": "Prescription",
+        "imgDescription": ""
+      }
+    ]
+  },
+  {
+    "sectionId": 3,
+    "minLevel": 2,
+    "title": "Lvl 2",
+    "section": "accessories",
+    "items": [
+      {
+        "id": 30051,
+        "glassesId": "Prescription02",
+        "minScore": 100,
+        "imgSubtitle": "Prescription",
+        "imgDescription": ""
+      },
+      {
+        "id": 30052,
+        "glassesId": "Round",
+        "minScore": 160,
+        "imgSubtitle": "Prescription",
+        "imgDescription": ""
+      },
+      {
+        "id": 30053,
+        "glassesId": "Sunglasses",
+        "minScore": 260,
+        "imgSubtitle": "Sunglasses",
+        "imgDescription": ""
+      }
+    ]
+  },
+  {
+    "sectionId": 3,
+    "minLevel": 3,
+    "title": "Lvl 3",
+    "section": "accessories",
+    "items": [
+      {
+        "id": 30054,
+        "glassesId": "Wayfarers",
+        "minScore": 300,
+        "imgSubtitle": "Wayfarers",
+        "imgDescription": ""
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/src/config/avatarCategoryItems/categoryHairColor.json b/src/config/avatarCategoryItems/categoryHairColor.json
new file mode 100644
index 000000000..4ed2f91e3
--- /dev/null
+++ b/src/config/avatarCategoryItems/categoryHairColor.json
@@ -0,0 +1,89 @@
+[
+  {
+    "sectionId": 5,
+    "minLevel": 1,
+    "title": "Lvl 1",
+    "section": "top",
+    "items": [
+      {
+        "id": 50062,
+        "hairColor": "Red",
+        "minScore": 20,
+        "imgSubtitle": "Red",
+        "imgDescription": ""
+      },
+      {
+        "id": 50063,
+        "hairColor": "Black",
+        "minScore": 50,
+        "imgSubtitle": "Black",
+        "imgDescription": ""
+      },
+      {
+        "id": 50064,
+        "hairColor": "Blonde",
+        "minScore": 70,
+        "imgSubtitle": "Blonde",
+        "imgDescription": ""
+      },
+      {
+        "id": 50065,
+        "hairColor": "BlondeGolden",
+        "minScore": 130,
+        "imgSubtitle": "Blonde Golden",
+        "imgDescription": ""
+      }
+    ]
+  },
+  {
+    "sectionId": 5,
+    "minLevel": 2,
+    "title": "Lvl 2",
+    "section": "top",
+    "items": [
+      {
+        "id": 50066,
+        "hairColor": "Brown",
+        "minScore": 180,
+        "imgSubtitle": "Brown",
+        "imgDescription": ""
+      },
+      {
+        "id": 50067,
+        "hairColor": "BrownDark",
+        "minScore": 200,
+        "imgSubtitle": "Brown Dark",
+        "imgDescription": ""
+      },
+      {
+        "id": 50068,
+        "hairColor": "PastelPink",
+        "minScore": 320,
+        "imgSubtitle": "Pastel Pink",
+        "imgDescription": "but why?"
+      },
+      {
+        "id": 50069,
+        "hairColor": "Platinum",
+        "minScore": 400,
+        "imgSubtitle": "Platinum",
+        "imgDescription": ""
+      }
+    ]
+  },
+  {
+    "sectionId": 5,
+    "minLevel": 3,
+    "title": "Lvl 3",
+    "section": "top",
+    "items": [
+      {
+        "id": 50071,
+        "hairColor": "SilverGray",
+        "minScore": 500,
+        "imgSubtitle": "SilverGray",
+        "imgDescription": ""
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/src/config/avatarCategoryItems/categoryHaircut.json b/src/config/avatarCategoryItems/categoryHaircut.json
new file mode 100644
index 000000000..eefcfb33c
--- /dev/null
+++ b/src/config/avatarCategoryItems/categoryHaircut.json
@@ -0,0 +1,307 @@
+[
+  {
+    "sectionId": 2,
+    "title": "Lvl 1",
+    "section": "top",
+    "minLevel": 1,
+    "items": [
+      {
+        "id": 20009,
+        "haircutId": "NoHair",
+        "minScore": 20,
+        "imgSubtitle": "Bald",
+        "imgDescription": "no hair"
+      },
+      {
+        "id": 20010,
+        "haircutId": "LongHairFro",
+        "minScore": 40,
+        "imgSubtitle": "Afro",
+        "imgDescription": ""
+      },
+      {
+        "id": 20011,
+        "haircutId": "ShortHairShortCurly",
+        "minScore": 60,
+        "imgSubtitle": "Short Hair",
+        "imgDescription": "Curly"
+      },
+      {
+        "id": 20012,
+        "haircutId": "ShortHairShortFlat",
+        "minScore": 100,
+        "imgSubtitle": "Short Hair",
+        "imgDescription": "Flat"
+      },
+      {
+        "id": 20013,
+        "haircutId": "ShortHairShortRound",
+        "minScore": 140,
+        "imgSubtitle": "Short Hair",
+        "imgDescription": "Round"
+      },
+      {
+        "id": 20014,
+        "haircutId": "ShortHairShortWaved",
+        "minScore": 160,
+        "imgSubtitle": "Short Hair",
+        "imgDescription": "Waved"
+      },
+      {
+        "id": 20015,
+        "haircutId": "ShortHairSides",
+        "minScore": 180,
+        "imgSubtitle": "Short Hair",
+        "imgDescription": "Sides"
+      },
+      {
+        "id": 20030,
+        "haircutId": "LongHairBob",
+        "minScore": 200,
+        "imgSubtitle": "Long Hair",
+        "imgDescription": "Bob"
+      }
+    ]
+  },
+
+  {
+    "sectionId": 2,
+    "title": "Lvl 2",
+    "section": "top",
+    "minLevel": 2,
+    "items": [
+      {
+        "id": 20016,
+        "haircutId": "ShortHairTheCaesar",
+        "minScore": 220,
+        "imgSubtitle": "Short Hair",
+        "imgDescription": "Caesar"
+      },
+      {
+        "id": 20017,
+        "haircutId": "ShortHairTheCaesarSidePart",
+        "minScore": 240,
+        "imgSubtitle": "Short Hair",
+        "imgDescription": "Caesar Side"
+      }
+    ]
+  },
+  {
+    "sectionId": 2,
+    "title": "Lvl 3",
+    "section": "top",
+    "minLevel": 3,
+    "items": [
+      {
+        "id": 20018,
+        "haircutId": "LongHairBun",
+        "minScore": 280,
+        "imgSubtitle": "Long Hair",
+        "imgDescription": "Bun"
+      }
+    ]
+  },
+  {
+    "sectionId": 2,
+    "title": "Lvl 4",
+    "section": "top",
+    "minLevel": 4,
+    "items": [
+      {
+        "id": 20019,
+        "haircutId": "LongHairCurly",
+        "minScore": 290,
+        "imgSubtitle": "Long Hair",
+        "imgDescription": "Curly"
+      },
+      {
+        "id": 20020,
+        "haircutId": "LongHairCurvy",
+        "minScore": 300,
+        "imgSubtitle": "Long Hair",
+        "imgDescription": "Curvy"
+      },
+      {
+        "id": 20021,
+        "haircutId": "LongHairDreads",
+        "minScore": 310,
+        "imgSubtitle": "Long Hair",
+        "imgDescription": "Dreads"
+      },
+      {
+        "id": 20022,
+        "haircutId": "LongHairFrida",
+        "minScore": 320,
+        "imgSubtitle": "Long Hair",
+        "imgDescription": "Frida"
+      },
+      {
+        "id": 20023,
+        "haircutId": "LongHairFro",
+        "minScore": 330,
+        "imgSubtitle": "Long Hair",
+        "imgDescription": "Fro"
+      }
+    ]
+  },
+
+  {
+    "sectionId": 2,
+    "title": "Lvl 5",
+    "section": "top",
+    "minLevel": 5,
+    "items": [
+      {
+        "id": 20024,
+        "haircutId": "LongHairFroBand",
+        "minScore": 340,
+        "imgSubtitle": "Long Hair",
+        "imgDescription": "Fro Band"
+      },
+      {
+        "id": 20025,
+        "haircutId": "LongHairNotTooLong",
+        "minScore": 360,
+        "imgSubtitle": "Long Hair",
+        "imgDescription": "Not too long"
+      },
+      {
+        "id": 20026,
+        "haircutId": "LongHairShavedSides",
+        "minScore": 380,
+        "imgSubtitle": "Long Hair",
+        "imgDescription": "Shaved Sides"
+      },
+      {
+        "id": 20027,
+        "haircutId": "LongHairMiaWallace",
+        "minScore": 400,
+        "imgSubtitle": "Long Hair",
+        "imgDescription": "Mia Wallace"
+      },
+      {
+        "id": 20028,
+        "haircutId": "LongHairStraight",
+        "minScore": 420,
+        "imgSubtitle": "Long Hair",
+        "imgDescription": "Straight 1"
+      }
+    ]
+  },
+
+  {
+    "sectionId": 2,
+    "title": "Lvl 6",
+    "section": "top",
+    "minLevel": 6,
+    "items": [
+      {
+        "id": 20029,
+        "haircutId": "LongHairStraight2",
+        "minScore": 440,
+        "imgSubtitle": "Long Hair",
+        "imgDescription": "Straigt 2"
+      },
+      {
+        "id": 20030,
+        "haircutId": "LongHairStraightStrand",
+        "minScore": 460,
+        "imgSubtitle": "Long Hair",
+        "imgDescription": "Straight Strand"
+      },
+      {
+        "id": 20031,
+        "haircutId": "ShortHairDreads01",
+        "minScore": 480,
+        "imgSubtitle": "Short Hair",
+        "imgDescription": "Dreads 1"
+      },
+      {
+        "id": 20032,
+        "haircutId": "ShortHairDreads02",
+        "minScore": 500,
+        "imgSubtitle": "Short Hair",
+        "imgDescription": "Dreads 2"
+      },
+      {
+        "id": 20033,
+        "haircutId": "ShortHairFrizzle",
+        "minScore": 520,
+        "imgSubtitle": "Short Hair",
+        "imgDescription": "Frizzle"
+      }
+    ]
+  },
+  {
+    "sectionId": 2,
+    "title": "Lvl 7",
+    "section": "top",
+    "minLevel": 7,
+    "items": [
+      {
+        "id": 20034,
+        "haircutId": "Eyepatch",
+        "minScore": 530,
+        "imgSubtitle": "Eyepatch",
+        "imgDescription": "Pirate"
+      },
+      {
+        "id": 20035,
+        "haircutId": "Hat",
+        "minScore": 540,
+        "imgSubtitle": "Hat",
+        "imgDescription": ""
+      },
+      {
+        "id": 20036,
+        "haircutId": "Hijab",
+        "minScore": 560,
+        "imgSubtitle": "Hijab",
+        "imgDescription": ""
+      }
+    ]
+  },
+  {
+    "sectionId": 2,
+    "title": "Lvl 8",
+    "section": "top",
+    "minLevel": 8,
+    "items": [
+      {
+        "id": 20037,
+        "haircutId": "Turban",
+        "minScore": 580,
+        "imgSubtitle": "Turban",
+        "imgDescription": ""
+      },
+      {
+        "id": 20038,
+        "haircutId": "WinterHat1",
+        "minScore": 600,
+        "imgSubtitle": "Winter Hat",
+        "imgDescription": "warm"
+      },
+      {
+        "id": 20039,
+        "haircutId": "WinterHat2",
+        "minScore": 620,
+        "imgSubtitle": "Winter Hat",
+        "imgDescription": "very warm"
+      },
+      {
+        "id": 20040,
+        "haircutId": "WinterHat3",
+        "minScore": 640,
+        "imgSubtitle": "Winter Hat",
+        "imgDescription": "keeps warm"
+      },
+      {
+        "id": 20041,
+        "haircutId": "WinterHat4",
+        "minScore": 660,
+        "imgSubtitle": "Winter Hat",
+        "imgDescription": "keeps warm"
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/src/config/avatarCategoryItems/categoryShirt.json b/src/config/avatarCategoryItems/categoryShirt.json
new file mode 100644
index 000000000..a9babceeb
--- /dev/null
+++ b/src/config/avatarCategoryItems/categoryShirt.json
@@ -0,0 +1,89 @@
+[
+  {
+    "sectionId": 1,
+    "title": "Lvl 1",
+    "section": "clothe",
+    "minLevel": 1,
+    "items": [
+      {
+        "id": 10001,
+        "shirtId": "BlazerSweater",
+        "minScore": 20,
+        "imgSubtitle": "Blazer",
+        "imgDescription": "blue"
+      },
+      {
+        "id": 10002,
+        "shirtId": "CollarSweater",
+        "clotheColor": "PastelBlue",
+        "minScore": 40,
+        "imgSubtitle": "Collar",
+        "imgDescription": "Sweater blue"
+      },
+      {
+        "id": 10003,
+        "shirtId": "GraphicShirt",
+        "clotheColor": "PastelOrange",
+        "minScore": 60,
+        "imgSubtitle": "Graphic Shirt",
+        "imgDescription": "yellow"
+      },
+      {
+        "id": 10004,
+        "shirtId": "Hoodie",
+        "clotheColor": "PastelRed",
+        "minScore": 100,
+        "imgSubtitle": "Hoodie",
+        "imgDescription": "red / pink"
+      }
+    ]
+  },
+  {
+    "sectionId": 1,
+    "title": "Lvl 2",
+    "section": "clothe",
+    "minLevel": 2,
+    "items": [
+      {
+        "id": 10005,
+        "shirtId": "Overall",
+        "clotheColor": "Blue03",
+        "minScore": 140,
+        "imgSubtitle": "Overall",
+        "imgDescription": "blue"
+      },
+      {
+        "id": 10006,
+        "shirtId": "ShirtCrewNeck",
+        "clotheColor": "Blue02",
+        "minScore": 200,
+        "imgSubtitle": "Crew Neck",
+        "imgDescription": "blue"
+      }
+    ]
+  },
+  {
+    "sectionId": 1,
+    "title": "Lvl 3",
+    "section": "clothe",
+    "minLevel": 3,
+    "items": [
+      {
+        "id": 10007,
+        "shirtId": "ShirtScoopNeck",
+        "clotheColor": "Blue03",
+        "minScore": 240,
+        "imgSubtitle": "Scoop Neck",
+        "imgDescription": "Shirt"
+      },
+      {
+        "id": 10008,
+        "shirtId": "ShirtVNeck",
+        "clotheColor": "Pink",
+        "minScore": 260,
+        "imgSubtitle": "Shirt V Neck",
+        "imgDescription": ""
+      }
+    ]
+  }
+]
diff --git a/src/config/avatarCategoryItems/categorySkinColor.json b/src/config/avatarCategoryItems/categorySkinColor.json
new file mode 100644
index 000000000..dccbedfde
--- /dev/null
+++ b/src/config/avatarCategoryItems/categorySkinColor.json
@@ -0,0 +1,67 @@
+[
+  {
+    "sectionId": 4,
+    "minLevel": 1,
+    "title": "Lvl 1",
+    "section": "skin",
+    "items": [
+      {
+        "id": 40055,
+        "skinId": "Tanned",
+        "minScore": 10,
+        "imgSubtitle": "Tanned",
+        "imgDescription": ""
+      },
+      {
+        "id": 40056,
+        "skinId": "Yellow",
+        "minScore": 10,
+        "imgSubtitle": "Yellow",
+        "imgDescription": ""
+      },
+      {
+        "id": 40057,
+        "skinId": "Pale",
+        "minScore": 10,
+        "imgSubtitle": "Pale",
+        "imgDescription": ""
+      }
+    ]
+  },
+  {
+    "sectionId": 4,
+    "minLevel": 1,
+    "title": "",
+    "section": "skin",
+    "items": [
+      {
+        "id": 40058,
+        "skinId": "Light",
+        "minScore": 10,
+        "imgSubtitle": "Light",
+        "imgDescription": ""
+      },
+      {
+        "id": 40059,
+        "skinId": "Brown",
+        "minScore": 10,
+        "imgSubtitle": "Brown",
+        "imgDescription": ""
+      },
+      {
+        "id": 40060,
+        "skinId": "DarkBrown",
+        "minScore": 10,
+        "imgSubtitle": "Dark Brown",
+        "imgDescription": ""
+      },
+      {
+        "id": 40061,
+        "skinId": "Black",
+        "minScore": 10,
+        "imgSubtitle": "Black",
+        "imgDescription": ""
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/src/config/entries.json b/src/config/entries.json
new file mode 100644
index 000000000..06b544ad5
--- /dev/null
+++ b/src/config/entries.json
@@ -0,0 +1,19 @@
+{
+    "entries": [{
+        "id": "GLUTENFREEBREAKFAST",
+        "type": "MEAL"
+    },{
+        "id": "GLUTENFREELUNCH",
+        "type": "MEAL"
+    },{
+        "id": "GLUTENFREEDINNER",
+        "type": "MEAL"
+    },{
+        "id": "GLUTENBREAKFAST",
+        "type": "GLUTENMEAL"
+    },{
+        "id": "UNSUREBREAKFAST",
+        "type": "MEAL"
+    }
+]
+}
\ No newline at end of file
diff --git a/src/config/levels.json b/src/config/levels.json
new file mode 100644
index 000000000..d0728e031
--- /dev/null
+++ b/src/config/levels.json
@@ -0,0 +1,81 @@
+{
+    "levels": [ {
+        "level": 2,
+        "points": 40
+    },{
+        "level": 3,
+        "points": 80
+    },{
+        "level": 4,
+        "points": 160
+    },{
+        "level": 5,
+        "points": 240
+    },{
+        "level": 6,
+        "points": 400
+    },{
+        "level": 7,
+        "points": 640
+    },{
+        "level": 8,
+        "points": 900
+    },{
+        "level": 9,
+        "points": 1400
+    },{
+        "level": 10,
+        "points": 2000
+    },{
+        "level": 11,
+        "points": 2500
+    },{
+        "level": 12,
+        "points": 3000
+    },{
+        "level": 13,
+        "points": 4200
+    },{
+        "level": 14,
+        "points": 5500
+    },{
+        "level": 15,
+        "points": 6800
+    },{
+        "level": 15,
+        "points": 8000
+    },{
+        "level": 17,
+        "points": 9500
+    },{
+        "level": 18,
+        "points": 11000
+    },{
+        "level": 19,
+        "points": 12500
+    },{
+        "level": 20,
+        "points": 14000
+    },{
+        "level": 21,
+        "points": 30000
+    },{
+        "level": 22,
+        "points": 60000
+    },{
+        "level": 23,
+        "points": 100000
+    },{
+        "level": 24,
+        "points": 200000
+    },{
+        "level": 25,
+        "points": 500000
+    },{
+        "level": 26,
+        "points": 1000000
+    },{
+        "level": 42,
+        "points": 2147483647
+    }  ]
+}
\ No newline at end of file
diff --git a/src/config/streaks.json b/src/config/streaks.json
new file mode 100644
index 000000000..7d425572a
--- /dev/null
+++ b/src/config/streaks.json
@@ -0,0 +1,32 @@
+{
+    "streaks": [ {
+        "id": "GLUTENFREEBREAKFASTADDEDDAYS",
+        "name": "Added gluten free breakfasts for %n% days!",
+        "interval": 2,
+        "pointmultiplier": 3,
+        "entryid": "GLUTENFREEBREAKFAST",
+        "timetype": "DAY"
+    },{
+        "id": "GLUTENFREELUNCHADDEDDAYS",
+        "name": "Added gluten free lunches for %n% days!",
+        "interval": 5,
+        "pointmultiplier": 3,
+        "entryid": "GLUTENFREELUNCH",
+        "timetype": "DAY"
+    },{
+        "id": "GLUTENFREEDINNERADDED",
+        "name": "Added gluten free dinners for %n% days!",
+        "interval": 5,
+        "pointmultiplier": 3,
+        "entryid": "GLUTENFREEDINNER",
+        "timetype": "DAY"
+    },{
+        "id": "ENTRIESINAROW",
+        "name": "Logged something for %n% days in a row",
+        "interval": 10,
+        "pointmultiplier": 1,
+        "entryid": "",
+        "timetype": "DAY"
+    }
+    ]
+}
\ No newline at end of file
diff --git a/src/constants/Events.js b/src/constants/Events.js
new file mode 100644
index 000000000..077bb4608
--- /dev/null
+++ b/src/constants/Events.js
@@ -0,0 +1,8 @@
+
+export default Events = {
+        "Symptom": 0, 
+        "Food": 1,
+        "Emotion": 2,
+        "GIP": 3
+      };
+  
diff --git a/src/manager/DatabaseManager.js b/src/manager/DatabaseManager.js
index 07dbababc..5a83ba79f 100644
--- a/src/manager/DatabaseManager.js
+++ b/src/manager/DatabaseManager.js
@@ -1,233 +1,386 @@
 import * as SQLite from 'expo-sqlite';
 import { images as SymptomIcons } from '../components/SymptomTracker/SymptomIconButtonConstants';
 
-export default class DatabaseManager {
+import BLOATING_ICON from '../assets/images/SymptomTracker/bloating.png';
+import DIARRHEA_ICON from '../assets/images/SymptomTracker/diarrhea.png';
+import HEADACHE_ICON from '../assets/images/SymptomTracker/headache.png';
+import IRRITABILITY_ICON from '../assets/images/SymptomTracker/irritability.png';
+import STOMACHACHE_ICON from '../assets/images/SymptomTracker/stomachAche.png';
+import STOMACH_RUMBLE_ICON from '../assets/images/SymptomTracker/stomachRumble.png';
+import VOMITING_ICON from '../assets/images/SymptomTracker/vomiting.png';
+import WEIGHT_LOSS_ICON from '../assets/images/SymptomTracker/weightLoss.png';
+import USER_SYMPTOM_ICON from '../assets/images/SymptomTracker/userDefinedSymptom.png';
+import LOSS_OF_APPETITE_ICON from '../assets/images/SymptomTracker/lossOfAppetite.png';
+import HUNGER_PAIN_ICON from '../assets/images/SymptomTracker/hungerPain.png';
+import FOOD_CRAVING_ICON from '../assets/images/SymptomTracker/craving.png';
+import TENESMUS_ICON from '../assets/images/SymptomTracker/tenesmus.png';
+import LOW_ENERGY_ICON from '../assets/images/SymptomTracker/tired.png';
+import Events from '../constants/Events';
+import NotificationManager from './NotificationManager';
 
-    /**
-     * @returns {DatabaseManager}
-     */
-    static getInstance() {
-        if (DatabaseManager.instance == null) {
-            DatabaseManager.instance = new DatabaseManager();
-
-            this.instance.db = SQLite.openDatabase('app.db');
-            this.instance.db.transaction(tx => {
-              tx.executeSql(
-                'CREATE TABLE IF NOT EXISTS symptoms (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, icon TEXT, created INT, modified INT, usage INT);', 
-                (param) => alert("create table symptoms: " + JSON.stringify(param)));            
-              tx.executeSql(
-                'INSERT OR IGNORE INTO symptoms (id, name, icon, created, usage) VALUES '
-                + '(1, "CLOATING", "' + require('../assets/images/SymptomTracker/cloating.png') + '", ' + Date.now() + ',0),'
-                + '(2, "DIARRHEA", "' + require('../assets/images/SymptomTracker/diarrhea.png') + '", ' + Date.now() + ',0),'
-                + '(3, "HEADACHE", "' + require('../assets/images/SymptomTracker/headache.png') + '", ' + Date.now() + ',0),'
-                + '(4, "IRRITABILITY", "' + require('../assets/images/SymptomTracker/irritability.png') + '", ' + Date.now() + ',0),'
-                + '(5, "STOMACHACHE", "' + require('../assets/images/SymptomTracker/stomachAche.png') +'", ' + Date.now() + ',0),'
-                + '(6, "VOMITING", "' + require('../assets/images/SymptomTracker/vomiting.png') + '", ' + Date.now() + ',0),'
-                + '(7, "WEIGHT_LOSS", "' + require('../assets/images/SymptomTracker/weightLoss.png') + '", ' + Date.now() + ',0);',
+export default class DatabaseManager {
+  
+  static APP_DB = 'app.db';
+  /**
+   * @returns {DatabaseManager}
+   */
+  static getInstance() {
+      if (DatabaseManager.instance == null) {
+          DatabaseManager.instance = new DatabaseManager();
+          
+          this.instance.db = SQLite.openDatabase(DatabaseManager.APP_DB);
+          
+          // this.instance.db.transaction(tx => {
+          //   tx.executeSql('DROP TABLE IF EXISTS settings;');
+          //   tx.executeSql('DROP TABLE IF EXISTS events;');
+          //   tx.executeSql('DROP TABLE IF EXISTS symptoms;');
+          // }, (error) => alert("DB init: " + JSON.stringify(error)));
+          
+          this.instance.db.transaction(tx => {
+            tx.executeSql(
+              'CREATE TABLE IF NOT EXISTS symptoms (\
+                id INTEGER PRIMARY KEY AUTOINCREMENT,\
+                name TEXT,\
+                icon TEXT,\
+                created INT,\
+                modified INT,\
+                usage INT);', 
+              (param) => alert("create table symptoms: " + JSON.stringify(param)));
+            
+            let now = Date.now();
+            
+            tx.executeSql(
+              'INSERT OR IGNORE INTO symptoms (id, name, icon, created, modified, usage) VALUES \
+                (1,  "BLOATING",               "' + BLOATING_ICON           + '", ' + now + ', ' + now + ', 0),\
+                (2,  "DIARRHEA",               "' + DIARRHEA_ICON           + '", ' + now + ', ' + now + ', 0),\
+                (3,  "HEADACHE",               "' + HEADACHE_ICON           + '", ' + now + ', ' + now + ', 0),\
+                (4,  "IRRITABILITY",           "' + IRRITABILITY_ICON       + '", ' + now + ', ' + now + ', 0),\
+                (5,  "ABDOMINAL_DISCOMFORT",   "' + STOMACHACHE_ICON        + '", ' + now + ', ' + now + ', 0),\
+                (6,  "NAUSEA",                 "' + VOMITING_ICON           + '", ' + now + ', ' + now + ', 0),\
+                (7,  "LOSS_OF_APPETITE",       "' + LOSS_OF_APPETITE_ICON   + '", ' + now + ', ' + now + ', 0),\
+                (8,  "RUMBLING_IN_STOMACH",    "' + STOMACH_RUMBLE_ICON     + '", ' + now + ', ' + now + ', 0),\
+                (9,  "TENESMUS",               "' + TENESMUS_ICON           + '", ' + now + ', ' + now + ', 0),\
+                (10, "HUNGER_PAINS",           "' + HUNGER_PAIN_ICON             + '", ' + now + ', ' + now + ', 0),\
+                (11, "LOW_ENERGY",             "' + LOW_ENERGY_ICON         + '", ' + now + ', ' + now + ', 0),\
+                (12, "FOOD_CRAVING",           "' + FOOD_CRAVING_ICON       + '", ' + now + ', ' + now + ', 0);',
                 (param) => alert("insert into symptoms: " + JSON.stringify(param)));
-              tx.executeSql(
-                'CREATE TABLE IF NOT EXISTS events (id INTEGER PRIMARY KEY AUTOINCREMENT, eventType INT, created INT, modified INT, objData TEXT);', 
-                (param) => alert("create table events: " + JSON.stringify(param)));
-              tx.executeSql(
-                'CREATE TABLE IF NOT EXISTS settings (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEX UNIQUE, objData TEXT);', 
-                (param) => alert("create table settings: " + JSON.stringify(param)));
-            }, (error) => alert("DB init: " + JSON.stringify(error)));
-        }
-
-        return this.instance;
-    }
-
-    /******************************************************************* 
-     *                          SYMPTOM TRACKER 
-     *******************************************************************/
-
-    createSymptom(name, icon, onError, onSuccess) {
-      this.db.transaction(tx => {
-        tx.executeSql('INSERT INTO symptoms (name, icon, created, usage) VALUES (?, ?, ?, 0)', [name, icon, Date.now()])
-      }, onError, onSuccess);
-    }
-
-    updateSymptom(symptomID, name, icon, onError, onSuccess) {
-      this.db.transaction(tx => {
-        tx.executeSql('UPDATE symptoms SET (name, icon, modified) VALUES (?, ?, ?) WHERE id = ?', [name, icon, Date.now(), symptomID]);
-      }, onError, onSuccess);
-    }
-
-    deleteSymptom(symptomID, onError, onSuccess) {
-      this.db.transaction(tx => {
-        // tx.executeSql('DELETE FROM events WHERE id = ?', [symptomID]);
-        tx.executeSql('DELETE FROM symptoms WHERE id = ?', [symptomID]);
-      }, onError, onSuccess);      
-    }
-
-    updateSymptomUsage(symptomID, onError, onSuccess) {
-      this.db.transaction(tx => {
-        tx.executeSql('UPDATE symptoms SET usage = usage + 1 WHERE id = ?', [symptomID]);
-      }, onError, onSuccess);
-    }
-
-    fetchSymptoms(onError, onSuccess) {
-      this.db.transaction(tx => {
-        tx.executeSql('SELECT * FROM symptoms ORDER BY usage DESC', null, onSuccess, onError);
-      });      
-    }
-
-    createSymptomEvent(symptomID, severity, note, timestamp, onError, onSuccess) {
-      let objData = {
-        symptomID,
-        //name: "",
-        //icon: "",
-        severity,
-        note
+            
+            tx.executeSql(
+              'CREATE TABLE IF NOT EXISTS events (\
+                id INTEGER PRIMARY KEY AUTOINCREMENT,\
+                eventType INT,\
+                created INT,\
+                modified INT,\
+                objData TEXT);', 
+              (param) => alert("create table events: " + JSON.stringify(param)));
+            
+            tx.executeSql(
+              'CREATE TABLE IF NOT EXISTS settings (\
+                id INTEGER PRIMARY KEY AUTOINCREMENT,\
+                name TEX UNIQUE,\
+                objData TEXT);', 
+              (param) => alert("create table settings: " + JSON.stringify(param)));
+            
+            tx.executeSql('INSERT OR IGNORE INTO settings (name, objData) VALUES \
+              ("lastRecorded", ' + now + ')',
+              (param) => alert("insert into settings: " + JSON.stringify(param)));
+              
+          }, (error) => alert("DB init error: " + JSON.stringify(error)));
       }
       
-      this.db.transaction(tx => {
-        tx.executeSql('SELECT * FROM symptoms WHERE id = ?', [symptomID], 
-          (_, {rows: {_array}}) => {
-            objData.name = _array[0].name;
-            objData.icon = _array[0].icon;
-            //objData.usage = _array[0].usage;
-
-            this.createEvent(0, timestamp, objData, onError, null);
-            this.updateSymptomUsage(symptomID, onError, onSuccess);
-          }, 
-          (_, param) => alert("-create events: " + JSON.stringify(param)));
-      });
+      return this.instance;
+  }
+
+  /******************************************************************* 
+   *                          SYMPTOM TRACKER 
+   *******************************************************************/
+
+  createSymptom(name, icon, onError, onSuccess) {
+    this.db.transaction(tx => {
+      let date = Date.now();
+      tx.executeSql('INSERT INTO symptoms (name, icon, created, modified, usage) VALUES (?, ?, ?, ?, 0)',
+        [name, icon, date, date])
+    }, onError, onSuccess);
+  }
+
+  //Unused
+  updateSymptom(symptomID, name, icon, onError, onSuccess) {
+    this.db.transaction(tx => {
+      tx.executeSql('UPDATE symptoms SET (name, icon, modified) VALUES (?, ?, ?) WHERE id = ?',
+        [name, icon, Date.now(), symptomID]);
+    }, onError, onSuccess);
+  }
+
+  //Public
+  deleteSymptom(symptomID, onError, onSuccess) {
+    this.db.transaction(tx => {
+      // tx.executeSql('DELETE FROM events WHERE id = ?', [symptomID]);
+      tx.executeSql('DELETE FROM symptoms WHERE id = ?', [symptomID]);
+    }, onError, onSuccess);      
+  }
+
+  updateSymptomUsage(symptomID, onError, onSuccess) {
+    this.db.transaction(tx => {
+      tx.executeSql('UPDATE symptoms SET usage = usage + 1 WHERE id = ?', [symptomID]);
+    }, onError, onSuccess);
+  }
+
+  //Public
+  fetchSymptoms(onError, onSuccess) {
+    this.db.transaction(tx => {
+      tx.executeSql('SELECT * FROM symptoms ORDER BY name ASC', null, onSuccess, onError);
+    });
+  }
+  
+  fetchUnrecordedSymptoms(tx, lastRecorded, onError, onSuccess) {
+    tx.executeSql('SELECT * FROM symptoms WHERE modified > ?', [lastRecorded], onSuccess, onError);
+  }
+
+  //Public
+  createSymptomEvent(symptomID, severity, note, timestamp, onError, onSuccess) {
+    let objData = {
+      symptomID,
+      //name: "",
+      //icon: "",
+      severity,
+      note
     }
-
-    updateSymptomEvent(eventID, symptomID, severity, note, onError, onSuccess) {
-      let objData = {
-        symptomID,
-        //name: "",
-        //icon: "",
-        severity,
-        note
-      }
-
-      this.db.transaction(tx => {
-        tx.executeSql('SELECT * FROM symptoms WHERE id = ?', [symptomID], 
-          (_, {rows: {_array}}) => {
+    
+    this.db.transaction(tx => {
+      tx.executeSql('SELECT * FROM symptoms WHERE id = ?',
+        [symptomID], 
+        (_, {rows: {_array}}) => {
+          if(!!_array[0]){
             objData.name = _array[0].name;
             objData.icon = _array[0].icon;
-
-            this.updateEvent(eventID, objData, onError, onSuccess);
-          }, 
-          (_, param) => alert("-create events: " + JSON.stringify(param)));
-      });
+          }
+          //objData.usage = _array[0].usage;
+          this.createEvent(Events.Symptom, timestamp, objData, onError, null);
+          this.updateSymptomUsage(symptomID, onError, onSuccess);
+        }, 
+        (_, param) => alert("create events: " + JSON.stringify(param)));
+    });
+  }
+
+  //unused
+  updateSymptomEvent(eventID, symptomID, severity, note, onError, onSuccess) {
+    let objData = {
+      symptomID,
+      //name: "",
+      //icon: "",
+      severity,
+      note
     }
 
-    /******************************************************************* 
-     *                          FOOD TRACKER 
-     *******************************************************************/   
-
-    createMealEvent(name, type, tag, rating, note, icon, timestamp, onError, onSuccess) {
-      let objData = {
-        name,
-        type,
-        tag,
-        rating,
-        icon,
-        note
-      }
-      
-      this.createEvent(1, timestamp, objData, onError, onSuccess);
+    this.db.transaction(tx => {
+      tx.executeSql('SELECT * FROM symptoms WHERE id = ?',
+        [symptomID], 
+        (_, {rows: {_array}}) => {
+          objData.name = _array[0].name;
+          objData.icon = _array[0].icon;
+
+          this.updateEvent(eventID, objData, onError, onSuccess);
+        }, 
+        (_, param) => alert("create events: " + JSON.stringify(param)));
+    });
+  }
+
+  /******************************************************************* 
+   *                          FOOD TRACKER 
+   *******************************************************************/   
+
+    //public
+  createMealEvent(name, type, tag, rating, note, icon, timestamp, onError, onSuccess) {
+    let objData = {
+      name,
+      type,
+      tag,
+      rating,
+      icon,
+      note
     }
-
-    updateMealEvent(eventID, name, type, tag, rating, note, onError, onSuccess) {
-      let objData = {
-        name,
-        type,
-        tag,
-        rating,
-        //icon,
-        note
-      }
-
-      this.updateEvent(eventID, objData, onError, onSuccess);
+    
+      //every time a meal is added, it will trigger a notification to be scheduled 24 hours later.
+      //All previously added notifications will be removed.
+      NotificationManager.getInstance().scheduleNotification();
+
+    this.createEvent(Events.Food, timestamp, objData, onError, onSuccess);
+  }
+
+  //unused
+  updateMealEvent(eventID, name, type, tag, rating, note, onError, onSuccess) {
+    let objData = {
+      name,
+      type,
+      tag,
+      rating,
+      //icon,
+      note
     }
-
-    /******************************************************************* 
-     *                          EMOTION TRACKER 
-     ********************************************************************/
-
-    createEmotionEvent(type, note, timestamp, onError, onSuccess) {
-      let objData = {
-        type,
-        note
-      }
-      
-      this.createEvent(2, timestamp, objData, onError, onSuccess);
+    
+    this.updateEvent(eventID, objData, onError, onSuccess);
+  }
+
+  /******************************************************************* 
+   *                          EMOTION TRACKER 
+   ********************************************************************/
+
+   //Public
+  createEmotionEvent(type, note, timestamp, onError, onSuccess) {
+    let objData = {
+      type,
+      note
     }
+    
+    this.createEvent(Events.Emotion, timestamp, objData, onError, onSuccess);
+  }
+
+  //unused
+  updateEmotionEvent(eventID, type, note, onError, onSuccess) {
+    let objData = {
+      type,
+      note
+    }
+    
+    this.updateEvent(eventID, objData, onError, onSuccess);
+  }  
+  
+   /******************************************************************* 
+   *                          GIP TRACKER 
+   ********************************************************************/
+
+   //Public
+   createGIPEvent(result, note, photo, timestamp, onError, onSuccess) {
+    let objData = {
+      result,
+      note,
+      photo,
+      timestamp
+    }
+    
+    this.createEvent(Events.GIP, timestamp, objData, onError, onSuccess);
+  }
+
+  /******************************************************************* 
+   *                          EVENT TRACKER
+   ********************************************************************/
+
+  createEvent(eventType, timestamp, objData, onError, onSuccess) {
+    this.db.transaction(tx => {
+      tx.executeSql('INSERT INTO events (eventType, created, modified, objData) VALUES (?, ?, ?, ?)',
+        [eventType, timestamp, timestamp, JSON.stringify(objData)]);
+    }, onError, onSuccess);
+  }
+
+  updateEvent(eventID, objData, onError, onSuccess) {
+    this.db.transaction(tx => {
+      tx.executeSql('UPDATE events SET (modified, objData) VALUES (?, ?) WHERE id = ?',
+        [Date.now(), objData, eventID]);
+    }, onError, onSuccess);
+  }
+
+  deleteEvent(eventID, onError, onSuccess) {
+    this.db.transaction(tx => {
+      tx.executeSql('DELETE FROM events WHERE id = ?', [eventID]);
+    }, onError, onSuccess);
+  }
+
+  fetchEventsCount(onError, onSuccess) {
+    this.db.transaction(tx => {
+        tx.executeSql(`SELECT COUNT(*) as noEvents,
+            strftime('%d', created / 1000, 'unixepoch') as day,
+            strftime('%m', created / 1000, 'unixepoch') as month,
+            strftime('%Y', created / 1000, 'unixepoch') as year
+            FROM events GROUP BY year, month, day;`,
+            [], onSuccess, onError);
+      });
+  }
 
-    updateEmotionEvent(eventID, type, note, onError, onSuccess) {
-      let objData = {
-        type,
-        note
-      }
-
-      this.updateEvent(eventID, objData, onError, onSuccess);
-    }    
-
-    /******************************************************************* 
-     *                          EVENT TRACKER
-     ********************************************************************/   
+  fetchEvents(timestamp, onError, onSuccess) {
+    if (timestamp != null) {
+      let start = new Date(timestamp);
+      let end = new Date(timestamp);
+      start.setHours(0, 0, 0);
+      end.setHours(23, 59, 59);
 
-    createEvent(eventType, timestamp, objData, onError, onSuccess) {
       this.db.transaction(tx => {
-        tx.executeSql('INSERT INTO events (eventType, created, objData) VALUES (?, ?, ?)', [eventType, timestamp, JSON.stringify(objData)]);
-      }, onError, onSuccess);
-    }
-
-    updateEvent(eventID, objData, onError, onSuccess) {
+        tx.executeSql('SELECT * FROM events '
+                    + 'WHERE created BETWEEN ? AND ? '
+                    + 'ORDER BY created DESC',
+          [start.getTime(), end.getTime()], onSuccess, onError);
+      });
+    } else {
       this.db.transaction(tx => {
-        tx.executeSql('UPDATE events SET (modified, objData) VALUES (?, ?) WHERE id = ?', [Date.now(), objData, eventID]);
-      }, onError, onSuccess);
+        tx.executeSql('SELECT * FROM events ORDER BY created DESC',
+          null, onSuccess, onError);
+      });
     }
-
-    deleteEvent(eventID, onError, onSuccess) {
+  }
+  
+  fetchUnrecordedEvents(tx, lastRecorded, onError, onSuccess) {
+    tx.executeSql('SELECT * FROM events WHERE modified > ?',
+      [lastRecorded], onSuccess, onError);
+  }
+
+  /******************************************************************* 
+   *                       Settings Database
+   ********************************************************************/   
+
+  loadSettings(name, onError, onSuccess) {
+    if (name == null) {
       this.db.transaction(tx => {
-        tx.executeSql('DELETE FROM events WHERE id = ?', [eventID]);
-      }, onError, onSuccess);
-    }
-
-    fetchEvents(timestamp, onError, onSuccess) {
-      if (timestamp != null) {
-        let start = new Date(timestamp);
-        let end = new Date(timestamp);
-        start.setHours(0, 0, 0);
-        end.setHours(23, 59, 59);
-
-        this.db.transaction(tx => {
-          tx.executeSql('SELECT * FROM events '
-                      + 'WHERE created BETWEEN ? AND ? '
-                      + 'ORDER BY created DESC', [start.getTime(), end.getTime()], onSuccess, onError);
-        });
-      } else {
-        this.db.transaction(tx => {
-          tx.executeSql('SELECT * FROM events ORDER BY created DESC', null, onSuccess, onError);
-        });
-      }
-    }   
-
-    /******************************************************************* 
-     *                       Settings Database
-     ********************************************************************/   
-
-    loadSettings(name, onError, onSuccess) {
-      if (name == null) {
-        this.db.transaction(tx => {
-          tx.executeSql('SELECT * FROM settings', null, onSuccess, onError);
-        });
-      } else {
-        this.db.transaction(tx => {
-          tx.executeSql('SELECT * FROM settings WHERE name = ?', [name], onSuccess, onError);
-        });
-      }
-    }
-
-    saveSettings(name, objData, onError, onSuccess) {
+        tx.executeSql('SELECT * FROM settings', null, onSuccess, onError);
+      });
+    } else {
       this.db.transaction(tx => {
-        tx.executeSql('REPLACE INTO settings (name, objData) VALUES (?, ?)', [name, JSON.stringify(objData)]);
-      }, onError, onSuccess);
+        tx.executeSql('SELECT * FROM settings WHERE name = ?',
+          [name], onSuccess, onError);
+      });
     }
-}
\ No newline at end of file
+  }
+
+  saveSettings(name, objData, onError, onSuccess) {
+    this.db.transaction(tx => {
+      tx.executeSql('REPLACE INTO settings (name, objData) VALUES (?, ?)',
+        [name, JSON.stringify(objData)]);
+    }, onError, onSuccess);
+  }
+  
+  fetchUnrecordedData(onError, onSuccess) {
+    let unrecordedData = {};
+    
+    this.db.transaction(tx => {
+      tx.executeSql('SELECT * FROM settings WHERE name = "lastRecorded"',
+        null,
+        (_, { rows: { _array } }) => {
+          let lastRecorded = Math.round(_array[0].objData, 0);
+          console.log('lastRecorded is ' + lastRecorded);
+          this.fetchUnrecordedSymptoms(
+            tx,
+            lastRecorded,
+            onError,
+            (_, { rows: { _array } }) => { unrecordedData.symptoms = _array; }
+          );
+          
+          this.fetchUnrecordedEvents(
+            tx,
+            lastRecorded,
+            onError,
+            (_, { rows: { _array } }) => { unrecordedData.events = _array; }
+          );
+        },
+        onError);
+    },
+    (_, error) => console.error(JSON.stringify(error)),
+    (_, success) => onSuccess(null, unrecordedData));
+  }
+  
+  updateLastRecorded() {
+    this.db.transaction(tx => {
+        tx.executeSql('UPDATE settings SET objData = ? WHERE name = "lastRecorded"', [Date.now()]);
+      },
+      (_, error) => console.error(JSON.stringify(error)),
+      (_, success) => console.log('Updated lastRecorded')
+    );
+  }
+}
diff --git a/src/manager/NotificationManager.js b/src/manager/NotificationManager.js
new file mode 100644
index 000000000..81f183e03
--- /dev/null
+++ b/src/manager/NotificationManager.js
@@ -0,0 +1,83 @@
+import { Alert, Platform } from 'react-native';
+import { Notifications } from 'expo';
+import * as Permissions from 'expo-permissions';
+import LanguageManager from './LanguageManager';
+
+//request permission to send notifications to user.
+async function getiOSNotificationPermission()
+{
+    const { status } = await Permissions.getAsync(Permissions.NOTIFICATIONS);
+    if (status !== 'granted') 
+    {
+        await Permissions.askAsync(Permissions.NOTIFICATIONS);
+    }
+}
+
+export default class NotificationManager 
+{
+    static getInstance()
+    {
+        if (NotificationManager.instance == null)
+        {
+            NotificationManager.instance = new NotificationManager();
+            this.instance.initialize();
+            this.instance.scheduleNotification();
+        }
+        return this.instance;
+    }
+
+    scheduleNotification() 
+    {
+        console.log("Scheduling a notification...");
+        //every time the user logs anything, reset all current notifications
+        Notifications.cancelAllScheduledNotificationsAsync();
+
+        const title = LanguageManager.getInstance().getText('NOTIFICATION_TITLE');
+        const body = LanguageManager.getInstance().getText('NOTIFICATION_BODY');
+
+        const localnotification = 
+        {
+            title: title,
+            body: body,
+            android: { sound: true },
+            ios: { sound: true },
+            data: {
+                title: title,
+                body: body
+            }
+        };
+        
+        let now = new Date();
+        let tomorrow = new Date();
+        tomorrow.setHours(now.getHours() + 12);
+
+        // if the new time falls early in the morning or late at night, set it to the next morning
+        if (tomorrow.getHours() <= 7 || tomorrow.getHours() >= 22)
+        {
+            tomorrow.setHours(8, 0, 0);
+            tomorrow.setDate(tomorrow.getDate() + 1);
+        }
+        const schedulingOptions = { time: tomorrow };
+        Notifications.scheduleLocalNotificationAsync(localnotification, schedulingOptions);
+    }
+
+    listenForNotifications = () =>
+    {
+        Notifications.addListener(notification => 
+        {
+            if (notification.origin === 'received' && Platform.OS === 'ios') 
+            {
+                if (notification.data)
+                {
+                    Alert.alert(notification.data.title, notification.data.body);
+                }
+            }
+        });
+    };
+
+    initialize() 
+    {
+        getiOSNotificationPermission();
+        this.listenForNotifications();
+    }
+}
diff --git a/src/manager/UploadManager.js b/src/manager/UploadManager.js
new file mode 100644
index 000000000..e18287ff2
--- /dev/null
+++ b/src/manager/UploadManager.js
@@ -0,0 +1,45 @@
+export default class UploadManager {
+  static UPLOAD_DATA_URL = 'https://jira.itcarlow.ie/desqol/upload_data';
+  
+  /**
+   * @returns {UploadManager}
+   */
+  static getInstance() {
+    if (UploadManager.instance == null) {
+      UploadManager.instance = new UploadManager();
+    }
+    
+    return UploadManager.instance;
+  }
+  
+  setToken(token) {
+    this.token = token;
+  }
+
+  getToken() {
+    return this.token;
+  }
+  
+  uploadData(data, onSuccess) {
+    console.log('Uploading data for ' + this.token);
+    fetch(UploadManager.UPLOAD_DATA_URL, {
+      method: 'POST',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+        'X-Token': this.token,
+      },
+      body: JSON.stringify(data),
+    }).then((response) => {
+      if (response.ok) {
+        console.log('Uploaded ' +
+          data.symptoms.length + ' symptoms and ' +
+          data.events.length + ' events'
+        );
+        onSuccess();
+      } else {
+        console.warn('Upload failed!');
+      }
+    });
+  }
+}
diff --git a/src/manager/buddyManager/AchievementManager.js b/src/manager/buddyManager/AchievementManager.js
new file mode 100644
index 000000000..83898d536
--- /dev/null
+++ b/src/manager/buddyManager/AchievementManager.js
@@ -0,0 +1,130 @@
+import { AsyncStorage } from "react-native";
+import { showMessage } from "react-native-flash-message";
+
+export default class AchievementManager {
+  static async triggerAchievement(achievementID) {
+    if (this.achievementsJson == undefined) {
+      this.achievementsJson = require("../../config/achievements.json").achievements;
+    }
+    if (this.levelJson == undefined) {
+      this.levelJson = require("../../config/levels.json").levels;
+    }
+    var achievement = this.achievementsJson.find(
+      (element) => element.id == achievementID
+    );
+    if (achievement.type == "ONETIME") {
+      var achieved = await AsyncStorage.getItem(achievement.id + "ACHIEVED");
+      if (achieved == undefined || achieved == null) {
+        await AsyncStorage.setItem(achievement.id + "ACHIEVED", "TRUE");
+      } else {
+        return;
+      }
+    }
+    await this.increaseLevelPoints(achievement.points);
+    var alertmsg = achievement.message + " - " + achievement.points + " points";
+    if (await this.checkLevelIncrease()) {
+      var currentlevel = await this.getCurrentLevel();
+      alertmsg += "\nReached level " + currentlevel.toString() + "!";
+    }
+    await this.sendAchievementAlert(alertmsg);
+  }
+  static async checkLevelIncrease() {
+    var levelpoints = await this.getLevelPoints();
+    var level = await this.getCurrentLevel();
+    var oldlevel = level;
+    var i = 0;
+    while (i < this.levelJson.length) {
+      if (levelpoints <= this.levelJson[i].points - 1) {
+        if (level < this.levelJson[i].level) {
+          level = this.levelJson[i].level - 1;
+          i = this.levelJson.length;
+        }
+      }
+      i++;
+    }
+    if (oldlevel < level) {
+      await AsyncStorage.setItem("level", level.toString());
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  static async getCurrentLevel() {
+    var level = "1";
+    level = await AsyncStorage.getItem("level");
+    if (level == null || level == NaN) {
+      await AsyncStorage.setItem("level", "1");
+      level = "1";
+    }
+    //console.debug("DB: level ", level);
+    return parseInt(level);
+  }
+
+  static async getLevelPoints() {
+    var levelpoints = "0";
+    levelpoints = await AsyncStorage.getItem("points");
+    if (levelpoints == null || levelpoints == NaN) {
+      await AsyncStorage.setItem("points", "0");
+      levelpoints = "0";
+    }
+    //console.debug("DB: level points:", levelpoints);
+    return parseInt(levelpoints);
+  }
+
+  static async increaseLevelPoints(increase) {
+    var levelpoints = await this.getLevelPoints();
+    levelpoints = levelpoints + increase;
+    await AsyncStorage.setItem("points", levelpoints.toString());
+  }
+
+  static sendAchievementAlert(text) {
+    showMessage({
+      message: "Achievement earned!",
+      description: text,
+      type: "success"
+    });
+  }
+
+  static async getCurrentLevelBounds() {
+    var currentLevel = await this.getCurrentLevel();
+    if (!currentLevel) {
+      console.error("DB: getCurrentLevel() failed.");
+      return;
+    }
+
+    var temp = require("../../config/levels.json").levels;
+
+    //bounds for level 1:
+    if (currentLevel < 2 && temp[0].points && temp[0].level) {
+      //console.debug("DB: lower: 0, upper: ", temp[0].points - 1);
+      return [0, temp[0].points - 1];
+    }
+    // prevent errors in all other cases but level 1:
+    if (
+      !(
+        temp[currentLevel - 1].level &&
+        temp[currentLevel - 1].points &&
+        temp[currentLevel - 2].level &&
+        temp[currentLevel - 2].points
+      )
+    ) {
+      console.error("DB: json file 'levels' is not valid!");
+      return [0, -1];
+    }
+    // case: level >= 2:
+    if (currentLevel) {
+      // lower bound:
+      var lower = temp[currentLevel - 2].points;
+      // uppervbound
+      var upper = temp[currentLevel - 1].points - 1;
+      //console.debug("borders:", lower, upper);
+      if (lower > upper){
+        console.log("you have reached the MAX level! Update levels.json!")
+        return [upper, upper];
+      }
+      return [lower, upper];
+    }
+    return [0, -1];
+  }
+}
diff --git a/src/manager/buddyManager/AchievementRecordManager.js b/src/manager/buddyManager/AchievementRecordManager.js
new file mode 100644
index 000000000..8e12fa031
--- /dev/null
+++ b/src/manager/buddyManager/AchievementRecordManager.js
@@ -0,0 +1,35 @@
+import {AsyncStorage} from 'react-native';
+import AchievementManager from './AchievementManager';
+
+
+export default class AchievementRecordManager{
+    static async getCountForAchievementRecord(id){
+        var count = await AsyncStorage.getItem(id + "count");
+        if( count == null ){
+            AsyncStorage.setItem(id + "count", "0");
+            count = 0
+        }
+        return parseInt(count);
+    }
+
+    static async increaseCountForAchievementRecord(id){
+        var achcount = await this.getCountForAchievementRecord(id);
+        achcount = achcount + 1;
+        await AsyncStorage.setItem(id + "count", achcount.toString());
+        var recordtype = require("../../config/achievementRecords.json").achievementrecords.find(element=>element.id == id).recordtype;
+        this.checkAchievements(recordtype, achcount);
+
+    }
+
+    static async increaseCountForAchievementRecordByType(type){
+        var achievementrecord = require("../../config/achievementRecords.json");
+        this.increaseCountForAchievementRecord(achievementrecord.achievementrecords.find(element=>element.recordtype == type).id);
+    }
+
+    static async checkAchievements(id, count){
+        // 10MEALSADDED Achievement
+        if(id == "MEAL" && count >= 10){
+            AchievementManager.triggerAchievement("10MEALSADDED");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/manager/buddyManager/EmotionStore.js b/src/manager/buddyManager/EmotionStore.js
new file mode 100644
index 000000000..112ff0079
--- /dev/null
+++ b/src/manager/buddyManager/EmotionStore.js
@@ -0,0 +1,107 @@
+import { observable, action } from "mobx";
+import { create, persist } from "mobx-persist";
+import { AsyncStorage } from "react-native";
+
+const hydrate = create({
+  storage: AsyncStorage,
+});
+
+class EmotionStore {
+    @observable eyeType = "Default";
+    @observable eyebrowType = "Default";
+    @observable mouthType = "Smile";
+    @observable accessoriesType = "Blank"; // No Glasses if avatar is sad
+    @observable accessoriesTypeEmotion = "Blank";
+    currentEmotion = 3;
+    @action
+    setEmotionId = (num) => {
+        this.currentEmotion = num;
+        switch (num){
+            case 1:
+            this.setSuperSad();
+                break;
+            case 2:
+            this.setSad();
+                break;
+            case 3:
+                this.setNeutral();
+                break;
+            case 4:
+
+                this.setHappy();
+                break;
+            case 5:
+                this.setSuperHappy();
+                break;
+            default:
+                console.error("SetEmotionId Failed", num);
+        }
+    }
+
+    @action
+    setSuperHappy = () => {
+        this.eyeType = "Happy";
+        this.eyebrowType= "RaisedExcited";
+        this.mouthType="Smile";
+        this.accessoriesTypeEmotion="Blank"; // for testing purpose
+
+    }
+
+    @action
+    setHappy = () => {
+        this.eyeType = "Default";
+        this.eyebrowType= "RaisedExcited";
+        this.mouthType="Twinkle";
+        this.accessoriesTypeEmotion="Blank"; // for testing purpose
+
+    }
+
+    @action
+    setNeutral = () => {
+        this.eyeType = "Default";
+        this.eyebrowType= "Default";
+        this.mouthType="Serious";
+        this.accessoriesTypeEmotion="Blank"; // for testing purpose
+
+    }
+
+    @action
+    setSad = () => {
+        this.eyeType = "Close";
+        this.eyebrowType= "RaisedExcited";
+        this.mouthType="Sad";
+        this.accessoriesTypeEmotion="Blank"; // for testing purpose
+
+    }
+
+    @action
+    setSuperSad = () => {
+        this.eyeType = "Cry";
+        this.eyebrowType= "SadConcerned";
+        this.mouthType="ScreamOpen";
+        this.accessoriesTypeEmotion="Blank"; // for testing purpose
+    }
+
+    getCurrentEmotion(){
+        return this.currentEmotion;
+    }
+}
+
+
+
+const schema = {
+    eyeType: true,
+    eyebrowType: true,
+    mouthType: true,
+    accessoriesType: true,
+};
+
+const emotionStore = new EmotionStore();
+
+const persistingStore = persist(schema)(emotionStore);
+hydrate("eyeType", persistingStore);
+hydrate("eyebrowType", persistingStore);
+hydrate("mouthType", persistingStore);
+hydrate("accessoriesType", persistingStore);
+
+export default persistingStore;
diff --git a/src/manager/buddyManager/EntryManager.js b/src/manager/buddyManager/EntryManager.js
new file mode 100644
index 000000000..ab3bf4989
--- /dev/null
+++ b/src/manager/buddyManager/EntryManager.js
@@ -0,0 +1,29 @@
+import {AsyncStorage} from "react-native";
+import AchievementRecordManager from "./AchievementRecordManager";
+import StreakManager from "./StreakManager";
+
+
+export default class EntryManager{
+    static async AddEntry(id){
+        //new Date = Timestamp mit aktuellem Datum und Zeit
+        var currdate = new Date();
+        var entry = require("../../config/entries.json").entries.find(element=>element.id == id);
+        await AsyncStorage.setItem("LastEntry", currdate.toString());
+        await AsyncStorage.setItem("LastEntry" + id, currdate.toString());
+        //alert('Meal added @ ' + currdate.toString());
+        await AchievementRecordManager.increaseCountForAchievementRecordByType(entry.type);
+        var streak = require("../../config/streaks.json").streaks.find(element=>element.entryid == id);
+        await StreakManager.checkStreak(streak.id);
+    }
+
+    static async AddEntryWithFakeTime(id, date){
+        var currdate = date;
+        var entry = require("../../config/entries.json").entries.find(element=>element.id == id);
+        await AsyncStorage.setItem("LastEntry", currdate.toString());
+        await AsyncStorage.setItem("LastEntry" + id, currdate.toString());
+        //alert('Meal added @ ' + currdate.toString());
+        await AchievementRecordManager.increaseCountForAchievementRecordByType(entry.type);
+        var streak = require("../../config/streaks.json").streaks.find(element => element.entryid == id);
+        await StreakManager.checkStreak(streak.id);
+    }
+}
\ No newline at end of file
diff --git a/src/manager/buddyManager/GlutenBuddyStore.js b/src/manager/buddyManager/GlutenBuddyStore.js
new file mode 100644
index 000000000..3f430abb2
--- /dev/null
+++ b/src/manager/buddyManager/GlutenBuddyStore.js
@@ -0,0 +1,164 @@
+import { observable, action } from "mobx";
+import { create, persist } from "mobx-persist";
+import { AsyncStorage, Platform } from "react-native";
+
+const hydrate = create({
+  storage: AsyncStorage,
+});
+
+class GlutenBuddyStore {  
+
+// default values:
+@observable size = 200;
+@observable avatarStyle = Platform.OS === 'ios' ? "Circle" : "Transparent";
+@observable topType = "ShortHairShortCurly";
+@observable accessoriesType = "Blank"; // categoryGlasses
+@observable hairColor = "Black";
+@observable facialHairType = "Blank"; // e.g. MoustacheMagnum; BeardMedium -> Not for teenagers;
+@observable clotheType = "CollarSweater";
+@observable clotheColor = "PastelBlue";
+@observable skinColor = "Tanned";
+
+@observable activeTopTypeId = 20011;
+@observable activeAccessoriesTypeId = 30048;
+@observable activeHairColorId = 50063;
+@observable activeFacialHairTypeId = 0;
+@observable activeClotheTypeId = 10002;
+@observable activeClotheColorId = 10002;
+@observable activeSkinColorId = 40055;
+
+// semi persistent points:
+@observable score = 0;
+@observable nextLevel = 1000;
+@observable currentLevel = 1;
+// for progress bar:
+@observable thisLevelBegin = 0;
+@observable thisLevelEnd = 1000;
+@observable progressBarProgress = 0.0;
+
+
+  @action
+  setTopType = (value) => {
+    this.topType = value;
+  };
+  @action
+  setAccessoriesType = (value) => {
+    this.accessoriesType = value;
+  };
+  @action
+  setHairColor = (value) => {
+    this.hairColor = value;
+  };
+  @action
+  setFacialHairType = (value) => {
+    this.facialHairType = value;
+  };
+  @action
+  setClotheType = (value) => {
+    this.clotheType = value;
+  };
+  @action
+  setClotheColor = (value) => {
+    this.clotheColor = value;
+  };
+  @action
+  setSkinColor = (value) => {
+    this.skinColor = value;
+  };
+  @action
+  setActiveTopTypeId = (value) => {
+    this.activeTopTypeId = value;
+  };
+  @action
+  setActiveAccessoriesTypeId = (value) => {
+    this.activeAccessoriesTypeId = value;
+  };
+  @action
+  setActiveHairColorId = (value) => {
+    this.activeHairColorId = value;
+  };
+  @action
+  setActiveFacialHairTypeId = (value) => {
+    this.activeFacialHairTypeId = value;
+  };
+  @action
+  setActiveClotheTypeId = (value) => {
+    this.activeClotheTypeId = value;
+  };
+  @action
+  setActiveClotheColorId = (value) => {
+    this.activeClotheColorId = value;
+  };
+  @action
+  setActiveSkinColorId = (value) => {
+    this.activeSkinColorId = value;
+  };
+
+  @action
+  setScore = (value) => {
+    this.score = value;
+  };
+
+  @action
+  setNextLevelScore = (value) => {
+    this.nextLevel = value;
+  };
+  @action
+  setCurrentLevel = (value) => {
+    this.currentLevel = value;
+  };
+
+  @action
+  setThisLevelBegin = (value) => {
+    this.thisLevelBegin = value;
+  };
+  @action
+  setThisLevelEnd = (value) => {
+    this.thisLevelEnd = value;
+  };
+
+  @action
+  setProgressBarProgress = (value) => {
+    this.progressBarProgress = value;
+  };
+}
+
+const schema = {
+  size: true,
+  avatarStyle: true,
+  topType: true,
+  accessoriesType: true,
+  hairColor: true,
+  facialHairType: true,
+  clotheType: true,
+  clotheColor: true,
+  skinColor: true,
+
+  activeTopTypeId: true,
+  activeAccessoriesTypeId: true,
+  activeHairColorId: true,
+  activeFacialHairTypeId: true,
+  activeClotheTypeId: true,
+  activeClotheColorId: true,
+  activeSkinColorId: true,
+};
+
+const store = new GlutenBuddyStore();
+
+const persistingStore = persist(schema)(store);
+hydrate("size", persistingStore);
+hydrate("avatarStyle", persistingStore);
+hydrate("topType", persistingStore);
+hydrate("accessoriesType", persistingStore);
+hydrate("hairColor", persistingStore);
+hydrate("facialHairType", persistingStore);
+hydrate("clotheType", persistingStore);
+hydrate("clotheColor", persistingStore);
+hydrate("skinColor", persistingStore);
+hydrate("score", persistingStore);
+hydrate("currentLevel", persistingStore);
+hydrate("thisLevelBegin", persistingStore); // for progress bar
+hydrate("thisLevelEnd", persistingStore); // for progress bar
+hydrate("progressBarProgress", persistingStore); // for progress bar
+
+export default persistingStore;
diff --git a/src/manager/buddyManager/LoggingStore.js b/src/manager/buddyManager/LoggingStore.js
new file mode 100644
index 000000000..a10aa1553
--- /dev/null
+++ b/src/manager/buddyManager/LoggingStore.js
@@ -0,0 +1,29 @@
+import { observable, action } from "mobx";
+import { create, persist } from "mobx-persist";
+import { AsyncStorage, Platform } from "react-native";
+
+const hydrate = create({
+  storage: AsyncStorage,
+});
+
+class LoggingStore {  
+
+@observable gamificationFlag = false;
+
+  @action
+  changeGamificationFlag = () => {
+    this.gamificationFlag = !this.gamificationFlag;
+  };
+}
+
+const schema = {
+  gamificationFlag: true,
+};
+
+const store = new LoggingStore();
+
+const persistingStore = persist(schema)(store);
+
+hydrate("gamificationFlag", persistingStore);
+
+export default persistingStore;
diff --git a/src/manager/buddyManager/StreakManager.js b/src/manager/buddyManager/StreakManager.js
new file mode 100644
index 000000000..d4c1e35a5
--- /dev/null
+++ b/src/manager/buddyManager/StreakManager.js
@@ -0,0 +1,56 @@
+import {AsyncStorage} from 'react-native';
+import AchievementManager from './AchievementManager';
+
+
+export default class StreakManager{
+
+    static async checkStreak(id){
+        var streakjson = require("../../config/streaks.json");
+        var streak = streakjson.streaks.find(element=>element.id == id);
+        var lastadded = await AsyncStorage.getItem("LastEntry" + streak.entryid);
+        var currdate = new Date();
+        var lastaddeddate = new Date(lastadded);
+        switch (streak.timetype) {
+            case "DAY":
+                if(dateDiffInDays(currdate, lastaddeddate) < 2){
+                    await this.increaseStreak(streak.id);
+                }
+        }
+        var streaknumber = await this.getStreakNumber(streak.id);
+        var streakinterval = streak.interval;
+        if(streaknumber != 0 && streaknumber % streakinterval == 0){
+            await AchievementManager.increaseLevelPoints(streak.pointmultiplier * streaknumber);
+            var levelincrease = await AchievementManager.checkLevelIncrease();
+            var alertmsg = streak.name.replace("%n%", streaknumber.toString())
+            if(levelincrease){
+                var level = await AchievementManager.getCurrentLevel();
+                alertmsg += "\nReached Level " + level.toString() + "!";
+            }
+            AchievementManager.sendAchievementAlert(alertmsg);
+        }
+    }
+
+    static async getStreakNumber(id){
+        var streaknumber = await AsyncStorage.getItem(id);
+        if(streaknumber == undefined || streaknumber == null){
+            await AsyncStorage.setItem(id, "0");
+            return 0;
+        }
+        return parseInt(streaknumber);
+    }
+
+    static async increaseStreak(id){
+        var newstreak = (await this.getStreakNumber(id)) + 1;
+        await AsyncStorage.setItem(id, newstreak.toString());
+
+    }
+
+}
+const _MS_PER_DAY = 1000 * 60 * 60 * 24;
+// a and b are javascript Date objects
+function dateDiffInDays(a, b) {
+    // Discard the time and time-zone information.
+    const utc1 = Date.UTC(a.getFullYear(), a.getMonth(), a.getDate());
+    const utc2 = Date.UTC(b.getFullYear(), b.getMonth(), b.getDate());
+    return Math.floor((utc2 - utc1) / _MS_PER_DAY);
+    }
\ No newline at end of file
diff --git a/src/manager/buddyManager/avatarItemsStore.js b/src/manager/buddyManager/avatarItemsStore.js
new file mode 100644
index 000000000..159770400
--- /dev/null
+++ b/src/manager/buddyManager/avatarItemsStore.js
@@ -0,0 +1,40 @@
+import { observable, action } from "mobx";
+import { create, persist } from "mobx-persist";
+import { AsyncStorage, Platform } from "react-native";
+import { WardrobeItems } from "../../config/wardrobeItems"
+
+const hydrate = create({
+  storage: AsyncStorage,
+});
+
+class AvatarItemStore {  
+
+@observable hairColor = "Black";
+@observable activeHairColorId = 50063;
+@observable myItems = WardrobeItems.getInstance().categoryShirt;
+
+  @action
+  setHairColor = (value) => {
+    this.hairColor = value;
+    
+  };
+
+  @action
+  setActiveHairColorId = (value) => {
+    this.activeHairColorId = value;
+  };
+}
+
+const schema = {
+  topType: true,
+  activeHairColorId: true,
+};
+
+const store = new AvatarItemStore();
+
+const persistingStore = persist(schema)(store);
+
+hydrate("hairColor", persistingStore);
+
+
+export default persistingStore;
diff --git a/src/navigation/MainTabNavigator.js b/src/navigation/MainTabNavigator.js
index 7c5150ffd..1a740d833 100644
--- a/src/navigation/MainTabNavigator.js
+++ b/src/navigation/MainTabNavigator.js
@@ -1,22 +1,32 @@
-import React from 'react';
-import { createStackNavigator, createMaterialTopTabNavigator } from 'react-navigation';
+import React from "react";
+import {
+  createStackNavigator,
+  createMaterialTopTabNavigator,
+} from "react-navigation";
 
-import TabBarIcon from '../components/TabBarIcon';
-import EvaluationScreen from '../screens/EvaluationScreen';
-import HomeScreen from '../screens/HomeScreen';
-import CalendarScreen from '../screens/CalendarScreen';
-import DebugScreen from '../screens/DebugScreen';
-import SymptomTrackerScreen from '../screens/SymptomTrackerScreen';
-import FoodDiaryScreen from '../screens/FoodDiaryScreen';
-import EmoteTrackerScreen from '../screens/EmoteTrackerScreen';
-import SymptomViewScreen from '../screens/SymptomViewScreen';
-import FoodViewScreen from '../screens/FoodViewScreen';
-import EmoteViewScreen from '../screens/EmoteViewScreen';
-import SettingsScreen from '../screens/SettingsScreen';
-import CameraScreen from '../screens/CameraScreen';
-import GearScreen from '../screens/GearScreen';
-import SymptomTrackerMoreSymptomsScreen from '../screens/SymptomTrackerMoreSymptomsScreen';
-import SymptomTrackerAddNewScreen from '../screens/SymptomTrackerAddNewScreen';
+import TabBarIcon from "../components/TabBarIcon";
+import EvaluationScreen from "../screens/EvaluationScreen";
+import HomeScreen from "../screens/HomeScreen";
+import CalendarScreen from "../screens/CalendarScreen";
+import DebugScreen from "../screens/DebugScreen";
+import SymptomTrackerScreen from "../screens/SymptomTrackerScreen";
+import FoodDiaryScreen from "../screens/FoodDiaryScreen";
+import GIPScreen from "../screens/GIPScreen";
+import EmoteTrackerScreen from "../screens/EmoteTrackerScreen";
+import SymptomViewScreen from "../screens/SymptomViewScreen";
+import FoodViewScreen from "../screens/FoodViewScreen";
+import GIPViewScreen from "../screens/GIPViewScreen";
+import EmoteViewScreen from "../screens/EmoteViewScreen";
+import SettingsScreen from "../screens/SettingsScreen";
+import CameraScreen from "../screens/CameraScreen";
+import GearScreen from "../screens/GearScreen";
+import SymptomTrackerMoreSymptomsScreen from "../screens/SymptomTrackerMoreSymptomsScreen";
+import SymptomTrackerAddNewScreen from "../screens/SymptomTrackerAddNewScreen";
+import GlutenbuddyRoot from "../screens/GlutenbuddyRoot";
+import Wardrobe from "../components/Glutenbuddy/screens/Wardrobe";
+import Challenges from "../components/Glutenbuddy/screens/Challenges";
+import Achievements from "../components/Glutenbuddy/screens/Achievements";
+import ChallengesTest from "../components/Glutenbuddy/screens/ChallengesTest";
 
 const EvaluationStack = createStackNavigator({
   Evaluation: EvaluationScreen,
@@ -26,90 +36,107 @@ const CalendarStack = createStackNavigator({
   Calendar: CalendarScreen,
 });
 
-const TabNavStack = createMaterialTopTabNavigator({
+const GlutenStack = createStackNavigator({
+  Glutenbuddy: GlutenbuddyRoot,
+});
+
+
+const TabNavStack = createMaterialTopTabNavigator(
+  {
     Evaluation: {
-        screen: EvaluationStack,
-        navigationOptions: {
-          //tabBarLabel: 'Evaluation',
-          tabBarIcon: ({ focused }) => (
-            <TabBarIcon
-              focused={focused}
-              name={'md-trending-up'}
-            />
-          ),
-        }
+      screen: EvaluationStack,
+      navigationOptions: {
+        //tabBarLabel: 'Evaluation',
+        tabBarIcon: ({ focused }) => (
+          <TabBarIcon focused={focused} name={"md-trending-up"} />
+        ),
+      },
     },
-    Home: {
-        screen: HomeScreen,
-        navigationOptions: {
-          //tabBarLabel: 'Home',
-          tabBarIcon: ({focused}) => (
-            <TabBarIcon
-              focused={focused}
-              name={'md-paw'}
-            />
-          )
-      }
+    Glutenbuddy: {
+      screen: GlutenStack,
+      navigationOptions: {
+        //tabBarLabel: 'Calendar',
+        tabBarIcon: ({ focused }) => (
+          <TabBarIcon focused={focused} name={"ios-happy"} />
+        ),
+      },
     },
     Calendar: {
-        screen: CalendarStack,
-        navigationOptions: {
-          //tabBarLabel: 'Calendar',
-          tabBarIcon: ({ focused }) => (
-            <TabBarIcon
-              focused={focused}
-              name={'md-calendar'}
-            />
-          )
-        }
-    }
-}, {
-    initialRouteName: 'Home',
-    tabBarPosition: 'bottom',
+      screen: CalendarStack,
+      navigationOptions: {
+        //tabBarLabel: 'Calendar',
+        tabBarIcon: ({ focused }) => (
+          <TabBarIcon focused={focused} name={"md-calendar"} />
+        ),
+      },
+    },
+/** // Screen for x-Day-challenge:
+    Home: {
+      screen: HomeScreen, //Note for Oisin: replace this with your component
+      navigationOptions: {
+        //tabBarLabel: 'Home',
+        tabBarIcon: ({ focused }) => (
+          <TabBarIcon focused={focused} name={"md-paw"} />
+        ),
+      },
+    },
+*/  
+  },
+  {
+    initialRouteName: "Glutenbuddy",
+    tabBarPosition: "bottom",
     swipeEnabled: false,
     tabBarOptions: {
-        showLabel: false,
-        showIcon: true,
-        style: {
-          backgroundColor: 'transparent',
-        },
-        indicatorStyle: {
-          backgroundColor: 'lightblue',
-        }
-    }
-});
+      showLabel: false,
+      showIcon: true,
+      style: {
+        backgroundColor: "transparent",
+      },
+      indicatorStyle: {
+        backgroundColor: "lightblue",
+      },
+    },
+    lazy: false,
+  }
+);
 
 export default createStackNavigator({
   TabBar: {
     screen: TabNavStack,
     navigationOptions: {
       header: null,
-    }
+    },
   },
   AddSymptom: {
     screen: SymptomTrackerScreen,
   },
-  MoreSymptoms:{
+  MoreSymptoms: {
     screen: SymptomTrackerMoreSymptomsScreen,
   },
   AddNewSymptom: {
-    screen: SymptomTrackerAddNewScreen
+    screen: SymptomTrackerAddNewScreen,
   },
   ViewSymptom: {
     screen: SymptomViewScreen,
-  },  
+  },
   AddMeal: {
     screen: FoodDiaryScreen,
   },
   ViewMeal: {
     screen: FoodViewScreen,
-  },    
+  },
   AddEmote: {
     screen: EmoteTrackerScreen,
   },
+  AddGIP: {
+    screen: GIPScreen,
+  },
+  ViewGIP: {
+    screen: GIPViewScreen,
+  },
   ViewEmote: {
     screen: EmoteViewScreen,
-  },   
+  },
   Settings: {
     screen: SettingsScreen,
   },
@@ -121,5 +148,12 @@ export default createStackNavigator({
   },
   Gear: {
     screen: GearScreen,
-  } 
-});
\ No newline at end of file
+  },
+
+  Wardrobe: Wardrobe,
+  Challenges: Challenges,
+  Achievements: {
+    screen: Achievements,
+  },
+  ChallengesTest: ChallengesTest,
+});
diff --git a/src/screens/CalendarScreen.js b/src/screens/CalendarScreen.js
index ddb599fe8..b52b11e16 100644
--- a/src/screens/CalendarScreen.js
+++ b/src/screens/CalendarScreen.js
@@ -8,16 +8,17 @@ import {
   TouchableOpacity
 } from 'react-native';
 
-import CeliCalendarPicker from "../components/CeliCalendarPicker";  
+import CeliCalendarPicker from "../components/CeliCalendarPicker";
 import EntryList from "../components/EntryList"
 import MenuButton from '../components/MenuButton';
 import LanguageManager from '../manager/LanguageManager';
-import HeaderSaveButton from '../components/HeaderSaveButton';
+import CeliLogger from '../analytics/analyticsManager';
 
+var count = 0
 export default class CalendarScreen extends React.Component {
-  static navigationOptions = ({navigation}) => ({
-    title: LanguageManager.getInstance().getText("CALENDAR"),
-    headerRight: <HeaderSaveButton type={2} onPress={() => navigation.state.params.onOkPressed()}/>
+
+  static navigationOptions = ({ navigation }) => ({
+    title: LanguageManager.getInstance().getText("CALENDAR")
   });
 
   state = {
@@ -25,10 +26,14 @@ export default class CalendarScreen extends React.Component {
     selectedDate: Date.now()
   }
 
-  componentDidMount() {        
-    this.props.navigation.setParams({ 
-        onOkPressed: this.resetDate.bind(this),
-    })
+  componentDidMount() {
+    this.props.navigation.setParams({
+      onOkPressed: this.resetDate.bind(this),
+    });
+    this.props.navigation.addListener('willFocus', () => {
+      this.refs.celiCalendar.onfocus();
+      CeliLogger.addLog(this.props.navigation.state.routeName, "tapped");
+    });
   }
 
   resetDate() {
@@ -36,18 +41,28 @@ export default class CalendarScreen extends React.Component {
   }
 
   onDateChange(date) {
+    let d = new Date(date);
+    d.setHours(new Date().getHours());
+    d.setMinutes(new Date().getMinutes());
     if (this.state.selectedDate != date) {
-      this.list.updateList(date)
-      this.setState({selectedDate: date})
+      this.list.updateList(date);
+      this.setState({ selectedDate: d });
+      this.onDatechangesListener(d);
     }
   }
 
+  getCurrentDate = () => {
+    return this.state.selectedDate;
+  }
+
   render() {
     return (
       <View style={styles.container}>
-        <CeliCalendarPicker selectedDate={this.state.selectedDate} onDateChange={(date) => this.onDateChange(date)}/>
+        <CeliCalendarPicker ref='celiCalendar' selectedDate={this.state.selectedDate} onDateChange={(date) => this.onDateChange(date)} />
         <EntryList navigation={this.props.navigation} selectedDate={this.state.selectedDate} ref={list => this.list = list} />
-        <MenuButton navigation={this.props.navigation}/>
+        <MenuButton navigation={this.props.navigation} shareConfig={{
+          onDateChanged: (onDatechangesListener) => { this.onDatechangesListener = onDatechangesListener; }
+        }} />
       </View>
     );
   }
diff --git a/src/screens/EmoteTrackerScreen.js b/src/screens/EmoteTrackerScreen.js
index 5e665e272..74dcfec6e 100644
--- a/src/screens/EmoteTrackerScreen.js
+++ b/src/screens/EmoteTrackerScreen.js
@@ -9,10 +9,15 @@ import DatabaseManager from '../manager/DatabaseManager';
 import LanguageManager from '../manager/LanguageManager';
 import GlutonManager from '../manager/GlutonManager';
 import DayChooser from '../components/DayChooser';
+import TimePicker from '../components/TimePicker';
 import HeaderSaveButton from '../components/HeaderSaveButton';
 import GearManager from '../manager/GearManager';
+import EmotionStore from '../manager/buddyManager/EmotionStore'
+import { observer } from "mobx-react";
+import CeliLogger from '../analytics/analyticsManager';
 
 
+@observer
 export default class EmoteTrackerScreen extends React.Component{
     static navigationOptions = ({navigation}) => ({
         title: LanguageManager.getInstance().getText("ADD_EMOTION"),
@@ -28,8 +33,6 @@ export default class EmoteTrackerScreen extends React.Component{
         this.state={
             show: false,
             selectedSymbolID: 3, // 1: unhappy, ... , 5: happy
-            selectedDateAndTime: new Date(), //works correctly \o/
-            tempDate: new Date(), //used to temporarliy save date and then set it to selectedDateAndTime after corresponding checks
             emoteNote: "",
             keyboardOpen: false,
             modified: false
@@ -43,6 +46,13 @@ export default class EmoteTrackerScreen extends React.Component{
        this._noteEdit.deleteNote();
      }
 
+     componentWillMount() {
+        this.setState({
+            selectedDateAndTime: this.props.navigation.state.params.selectedDateAndTime
+        });
+        CeliLogger.addLog(this.constructor.name, "opened");
+    }
+
     componentDidMount() {        
         this.props.navigation.setParams({ 
             onOkPressed: this.saveCurrentData.bind(this) ,
@@ -57,13 +67,13 @@ export default class EmoteTrackerScreen extends React.Component{
             'keyboardDidHide',
             this._keyboardDidHide,
           );
-
     }
 
     
     componentWillUnmount() {
         this.keyboardDidShowListener.remove();
         this.keyboardDidHideListener.remove();
+        CeliLogger.addLog(this.constructor.name, "closed");
       }
 
       _keyboardDidShow = ()  => {
@@ -94,7 +104,6 @@ export default class EmoteTrackerScreen extends React.Component{
 
     dateEditedHandler = (dateTime) =>{
         //TODO: if symptoms selected and not saved, ask user. Then refresh page.
-        this.state.tempDate = dateTime
 
         let tmpDateTime = this.state.selectedDateAndTime
         tmpDateTime.setDate(dateTime.getDate())
@@ -114,6 +123,17 @@ export default class EmoteTrackerScreen extends React.Component{
         }
     }
 
+    timeEditedHandler = (dateTime) => {
+        let tmpDateTime = this.state.selectedDateAndTime
+        tmpDateTime.setHours(dateTime.getHours())
+        tmpDateTime.setMinutes(dateTime.getMinutes())
+        //TODO: Change time of tmpDateTime
+
+        this.setState({
+            selectedDateAndTime: tmpDateTime,
+        })
+    }
+
     //TODO Uplift selectedSymbolID
 
     render(){
@@ -122,6 +142,8 @@ export default class EmoteTrackerScreen extends React.Component{
             <ScrollView style={{marginBottom: marginToUse}}>
                 <HorizontalLineWithText text = {LanguageManager.getInstance().getText("DATE")}/>
                 <DayChooser ref={component => this._dayChooser = component} date = {this.state.selectedDateAndTime} onDateChanged={this.dateEditedHandler}/>
+                <HorizontalLineWithText text = {LanguageManager.getInstance().getText("TIME")}/>
+                <TimePicker ref={component => this._timePicker = component} textString = "SYMPTOM_OCCURED" onTimeChanged={this.timeEditedHandler}/>
                 <HorizontalLineWithText text = {LanguageManager.getInstance().getText("EMOTION")}/>
                 <EmoteTrackerSymbolGroup ref={component => this._dayChooser = component} onEmotionChanged={this.emotionChangedHandler}/>
                 <HorizontalLineWithText text = {LanguageManager.getInstance().getText("NOTES")}/>
@@ -151,7 +173,8 @@ export default class EmoteTrackerScreen extends React.Component{
             (error) => {alert(error)}, 
             () => {GlutonManager.getInstance().setMessage(2); GearManager.getInstance().sendMessage("msg 30")}
         );
-
+        EmotionStore.setEmotionId(this.state.selectedSymbolID);
+        
         if (goHome) {
             setTimeout(() => this.navigateHome(), 100);
         }
diff --git a/src/screens/EmoteViewScreen.js b/src/screens/EmoteViewScreen.js
index 1a643fae4..fa786caf9 100644
--- a/src/screens/EmoteViewScreen.js
+++ b/src/screens/EmoteViewScreen.js
@@ -11,8 +11,7 @@ import HorizontalLineWithText from '../components/HorizontalLineWithText';
 
 export default class EmoteViewScreen extends React.Component {
     static navigationOptions = ({navigation}) => ({
-        title: LanguageManager.getInstance().getText("VIEW_EMOTION"),
-        headerRight: <HeaderMenuButton onHeaderMenuSelected={(index) => navigation.state.params.onHeaderMenuSelected(index)}/>
+        title: LanguageManager.getInstance().getText("VIEW_EMOTION")
     })
 
     state = {
diff --git a/src/screens/EvaluationScreen.js b/src/screens/EvaluationScreen.js
index fc2bf28fe..aaa03dd95 100644
--- a/src/screens/EvaluationScreen.js
+++ b/src/screens/EvaluationScreen.js
@@ -3,16 +3,23 @@ import { View, StyleSheet, } from 'react-native';
 import MenuButton from '../components/MenuButton';
 import EntryList from '../components/EntryList';
 import LanguageManager from '../manager/LanguageManager';
+import CeliLogger from '../analytics/analyticsManager';
 
 export default class EvaluationScreen extends React.Component {
-  static navigationOptions = ({navigation}) => ({
+  static navigationOptions = ({ navigation }) => ({
     title: LanguageManager.getInstance().getText("TRACKINGS"),
   });
+ 
+  componentDidMount() {
+    this.props.navigation.addListener('willFocus', () => {
+      CeliLogger.addLog(this.props.navigation.state.routeName, "tapped");
+    });
+  }
 
   render() {
     return (
       <View style={styles.container}>
-        <EntryList  navigation={this.props.navigation} />
+        <EntryList navigation={this.props.navigation} />
         <MenuButton navigation={this.props.navigation} />
       </View>
     );
diff --git a/src/screens/FoodDiaryScreen.js b/src/screens/FoodDiaryScreen.js
index 15e89c086..5cdf1842d 100644
--- a/src/screens/FoodDiaryScreen.js
+++ b/src/screens/FoodDiaryScreen.js
@@ -16,6 +16,9 @@ import LanguageManager from '../manager/LanguageManager';
 import GlutonManager from '../manager/GlutonManager';
 import HeaderSaveButton from '../components/HeaderSaveButton';
 import GearManager from '../manager/GearManager';
+import AchievementManager from '../manager/buddyManager/AchievementManager';
+import EntryManager from '../manager/buddyManager/EntryManager';
+import CeliLogger from '../analytics/analyticsManager';
 
 
 export default class FoodDiaryScreen extends React.Component{
@@ -36,9 +39,7 @@ export default class FoodDiaryScreen extends React.Component{
         this.classChangedHandler = this.classChangedHandler.bind(this);
         this.state = {
             foodEntryNote: "",
-            tempDate: new Date(), 
-            foodEntryName: "", 
-            selectedDateAndTime: new Date(), 
+            foodEntryName: "",            
             foodRating: 0,
             keyboardOpen: false,
             photo: null,
@@ -53,6 +54,13 @@ export default class FoodDiaryScreen extends React.Component{
         saveAsEmptyFoodDialogVisible: false,
     }
 
+    componentWillMount() {
+        this.setState({
+            selectedDateAndTime: this.props.navigation.state.params.selectedDateAndTime
+        });
+        CeliLogger.addLog(this.constructor.name, "opened");
+    }
+
     componentDidMount() {        
         this.props.navigation.setParams({ 
             onOkPressed: this.saveCurrentData.bind(this) ,
@@ -66,12 +74,12 @@ export default class FoodDiaryScreen extends React.Component{
             'keyboardDidHide',
             this._keyboardDidHide,
           );
-
     }
 
     componentWillUnmount() {
         this.keyboardDidShowListener.remove();
         this.keyboardDidHideListener.remove();
+        CeliLogger.addLog(this.constructor.name, "closed");
       }
 
     clearNoteText = () => {
@@ -105,7 +113,6 @@ export default class FoodDiaryScreen extends React.Component{
 
 
     dateEditedHandler = (dateTime) =>{
-        this.state.tempDate = dateTime
 
         let tmpDateTime = this.state.selectedDateAndTime
         tmpDateTime.setDate(dateTime.getDate())
@@ -178,7 +185,35 @@ export default class FoodDiaryScreen extends React.Component{
             (error) => {alert(error)}, 
             () => {GlutonManager.getInstance().setMessage(2); GearManager.getInstance().sendMessage("msg 31")}
         );
+        // AchievementAddition
+        if (this.state.selectedMealKey == 0){
+            if (this.state.selectedClassKey == 0){
+                EntryManager.AddEntry("GLUTENBREAKFAST");
+            }
+            if (this.state.selectedClassKey == 1){
+                EntryManager.AddEntry("GLUTENFREEBREAKFAST");
+            }
+            if (this.state.selectedClassKey == 2){
+                EntryManager.AddEntry("UNSUREBREAKFAST");
+            }
+        }
+        if (this.state.selectedMealKey == 1){
+            if (this.state.selectedClassKey == 0){
+
+            }
+            if (this.state.selectedClassKey == 1){
+                EntryManager.AddEntry("GLUTENFREELUNCH");
+            }
+        }
+        if (this.state.selectedMealKey == 2){
+            if (this.state.selectedClassKey == 0){
 
+            }
+            if (this.state.selectedClassKey == 1){
+                EntryManager.AddEntry("GLUTENFREEDINNER");
+            }
+        }
+        AchievementManager.triggerAchievement("MEALADDED");
         if (goHome) {
             setTimeout(() => this.navigateHome(), 100);
             }
@@ -227,12 +262,25 @@ export default class FoodDiaryScreen extends React.Component{
                 <DayChooser ref={component => this._dayChooser = component} date = {this.state.selectedDateAndTime} onDateChanged={this.dateEditedHandler}/>
                 <HorizontalLineWithText text = {LanguageManager.getInstance().getText("TIME")}/>
                 <TimePicker ref={component => this._timePicker = component} textString = "EATEN_AT" onTimeChanged={this.timeEditedHandler}/>
-                <HorizontalLineWithText text = {LanguageManager.getInstance().getText("NAME")}/>
-                <TextInputSingleLine ref={component => this._name = component} onTextChanged={this.nameEditedHandler} style={{Top: 10}}/>
-                <HorizontalLineWithText text = {LanguageManager.getInstance().getText("TAGS")}/>
-                <FoodDiaryTagEdit ref={component => this._class = component} all={tags} selected={this.state.selectedClassKey} isExclusive={true} onTagChanged={this.classChangedHandler}/>
                 <HorizontalLineWithText text = {LanguageManager.getInstance().getText("TYPES")}/>
                 <FoodDiaryTagEdit ref={component => this._meal = component} all={meals} selected={this.state.selectedMealKey} isExclusive={true} onTagChanged={this.mealChangedHandler}/>
+                <HorizontalLineWithText text = {LanguageManager.getInstance().getText("MEAL_NAME")}/>
+                <TextInputSingleLine
+                  ref={component => this._name = component}
+                  onTextChanged={this.nameEditedHandler}
+                  style={{Top: 10}}
+                  placeholderText= {LanguageManager.getInstance().getText("MEAL_NAME_PLACEHOLDER")}
+                />
+                <HorizontalLineWithText text = {LanguageManager.getInstance().getText("MEAL_NOTES")} style={{Top: 10}}/>
+                <NoteEdit
+                  ref={component => this._noteEdit = component}
+                  note={this.state.symptomEntryNote}
+                  onTextChanged={this.noteEditedHandler}
+                  style={{Top: 10}}
+                  placeholderText= {LanguageManager.getInstance().getText("MEAL_NOTES_PLACEHOLDER")}
+                />
+                <HorizontalLineWithText text = {LanguageManager.getInstance().getText("TAGS")}/>
+                <FoodDiaryTagEdit ref={component => this._class = component} all={tags} selected={this.state.selectedClassKey} isExclusive={true} onTagChanged={this.classChangedHandler}/>
                 <HorizontalLineWithText text = {LanguageManager.getInstance().getText("IMAGE")}/>
                 <View style={{alignItems: 'center'}}>
                     <FoodDiaryImageEdit navigation = {this.props.navigation} onPictureTaken={(image) => this.setState({photo: image})}/>
@@ -241,11 +289,9 @@ export default class FoodDiaryScreen extends React.Component{
                 <View style={{alignItems: 'center'}}>
                     <FoodDiaryRatingBar ref={component => this._rating = component}  onRatingChanged={this.ratingEditedHandler}/>
                 </View> 
-                <HorizontalLineWithText text = {LanguageManager.getInstance().getText("NOTES")} style={{Top: 10}}/>
-                <NoteEdit ref={component => this._noteEdit = component} note={this.state.symptomEntryNote} onTextChanged={this.noteEditedHandler} style={{Top: 10}}/>
                 <View>
                     <Dialog.Container visible={this.state.saveAsEmptyFoodDialogVisible}>
-                        <Dialog.Title>{LanguageManager.getInstance().getText("SAVE_EMPTY_FOOD")} </Dialog.Title>
+                        <Dialog.Title>{LanguageManager.getInstance().getText("SAVE_EMPTY_FOOD")}</Dialog.Title>
                         <Dialog.Description>
                         {LanguageManager.getInstance().getText("WANT_TO_SAVE_EMPTY_FOOD")}
                         </Dialog.Description>
diff --git a/src/screens/FoodViewScreen.js b/src/screens/FoodViewScreen.js
index 66424ef84..03cd95536 100644
--- a/src/screens/FoodViewScreen.js
+++ b/src/screens/FoodViewScreen.js
@@ -12,8 +12,7 @@ import FoodDiaryTagEdit from '../components/FoodDiary/FoodDiaryTagEdit'
 
 export default class FoodViewScreen extends React.Component {
     static navigationOptions = ({navigation}) => ({
-        title: LanguageManager.getInstance().getText("VIEW_MEAL"),
-        headerRight: <HeaderMenuButton onHeaderMenuSelected={(index) => navigation.state.params.onHeaderMenuSelected(index)}/>
+        title: LanguageManager.getInstance().getText("VIEW_MEAL")
     })
 
     state = {
diff --git a/src/screens/GIPScreen.js b/src/screens/GIPScreen.js
new file mode 100644
index 000000000..45777f815
--- /dev/null
+++ b/src/screens/GIPScreen.js
@@ -0,0 +1,270 @@
+import React from 'react';
+import { View, Button, Alert, ScrollView, Keyboard, TouchableOpacity, StyleSheet} from 'react-native';
+import Dialog from "react-native-dialog";
+import { HeaderBackButton } from 'react-navigation'
+import * as FileSystem from 'expo-file-system';
+import DatabaseManager from '../manager/DatabaseManager';
+import TextInputSingleLine from '../components/TextInputSingleLine';
+import NoteEdit from '../components/NoteEdit';
+import DayChooser from '../components/DayChooser';
+import TimePicker from '../components/TimePicker';
+import HorizontalLineWithText from '../components/HorizontalLineWithText';
+import FoodDiaryRatingBar from '../components/FoodDiary/FoodDiaryRatingBar';
+import FoodDiaryTagEdit from '../components/FoodDiary/FoodDiaryTagEdit'
+import FoodDiaryImageEdit from '../components/FoodDiary/FoodDiaryImageEdit'
+import LanguageManager from '../manager/LanguageManager';
+import GlutonManager from '../manager/GlutonManager';
+import HeaderSaveButton from '../components/HeaderSaveButton';
+import GearManager from '../manager/GearManager';
+import CeliLogger from '../analytics/analyticsManager';
+
+
+export default class GIPScreen extends React.Component{
+    static navigationOptions = ({navigation}) => ({
+        title: LanguageManager.getInstance().getText("ADD_GIP"),
+        headerLeft: <HeaderBackButton onPress={() => navigation.state.params.onCancelPressed()}/>,
+        headerRight: <HeaderSaveButton onPress={() => navigation.state.params.onOkPressed(true)}/>
+    })
+
+    constructor(props) {
+        super(props);
+        this.noteEditedHandler = this.noteEditedHandler.bind(this);
+        this.dateEditedHandler = this.dateEditedHandler.bind(this);
+        this.timeEditedHandler = this.timeEditedHandler.bind(this);
+        this.gipManualResultHandler = this.gipManualResultHandler.bind(this);
+        this.state = {
+            modified: false,
+            gipEntryNote: "",
+            keyboardOpen: false,
+            photo: null,            
+            gipManualResult : 2
+        }  
+    }
+
+    componentWillMount() {
+        this.setState({
+            selectedDateAndTime: this.props.navigation.state.params.selectedDateAndTime
+        });
+        CeliLogger.addLog(this.constructor.name, "opened");
+
+    }
+
+    componentDidMount() {        
+        this.props.navigation.setParams({ 
+            onOkPressed: this.saveCurrentData.bind(this) ,
+            onCancelPressed: this.handleCancelButton.bind(this) ,
+        })
+        this.keyboardDidShowListener = Keyboard.addListener(
+            'keyboardDidShow',
+            this._keyboardDidShow,
+          );
+          this.keyboardDidHideListener = Keyboard.addListener(
+            'keyboardDidHide',
+            this._keyboardDidHide,
+          );
+
+    }
+
+    componentWillUnmount() {
+        this.keyboardDidShowListener.remove();
+        this.keyboardDidHideListener.remove();
+        CeliLogger.addLog(this.constructor.name, "closed");
+      }
+
+    clearNoteText = () => {
+        this.setState({
+            gipEntryNote: ""
+        })
+       this._noteEdit.deleteNote();
+     }
+    
+    timeEditedHandler = (dateTime) =>{
+        let tmpDateTime = this.state.selectedDateAndTime
+        tmpDateTime.setHours(dateTime.getHours())
+        tmpDateTime.setMinutes(dateTime.getMinutes())
+
+        this.setState({
+            selectedDateAndTime: tmpDateTime,
+        })
+    }
+
+    _keyboardDidShow = ()  => {
+        this.setState({
+            keyboardOpen: true,
+        })
+      }
+    
+      _keyboardDidHide = ()  => {
+        this.setState({
+            keyboardOpen: false,
+        })
+      }
+
+
+    dateEditedHandler = (dateTime) =>{
+
+        let tmpDateTime = this.state.selectedDateAndTime
+        tmpDateTime.setDate(dateTime.getDate())
+        tmpDateTime.setMonth(dateTime.getMonth())
+        tmpDateTime.setFullYear(dateTime.getFullYear())
+        this.setState({
+            selectedDateAndTime: tmpDateTime,
+            modified: true
+        })
+        if(Array.isArray(this.state.selectedSymptoms) && this.state.selectedSymptoms.length){
+            this.showDayChangeSaveDialog()
+        }else{
+            //symptoms were not edited, but maybe the note. Delete note and update noteEdit
+            this.setState({
+                symptomEntryNote: ""
+            })
+            this.clearNoteText()
+        }
+    }
+  
+    gipManualResultHandler = (tag) =>{
+        this.setState({
+            gipManualResult: tag, 
+            modified: true           
+        });
+    }
+  
+    noteEditedHandler = (note) =>{
+        this.setState({
+            gipEntryNote: note,
+            modified: true
+        });
+    }
+
+    saveCurrentData(goHome) {
+        if (this.state.photo != null || this.state.modified == true){     
+            this.saveData(goHome)
+            }else{
+                this.showSaveEmptyDialog()
+            }        
+    }
+
+    saveData(goHome){
+        let tmpDateTime = this.state.selectedDateAndTime
+        tmpDateTime.setFullYear(tmpDateTime.getFullYear());
+        // if (this.state.photo) {
+        //   FileSystem.readAsStringAsync(this.state.photo.uri,
+        //     {'encoding': FileSystem.EncodingType.Base64})
+        //     .then(result => {
+        //       this.state.photo.base46 = result;
+        //       DatabaseManager.getInstance().createGIPEvent(
+        //         this.state.gipManualResult,
+        //         this.state.gipEntryNote,
+        //         this.state.photo,
+        //         tmpDateTime.getTime(),
+        //         (error) => {alert(error)},
+        //         () => {
+        //           GlutonManager.getInstance().setMessage(2);
+        //           GearManager.getInstance().sendMessage("msg 31")
+        //         }
+        //       );
+        //     })
+        //      .catch((err) => alert(error))
+        // } else {
+          DatabaseManager.getInstance().createGIPEvent(
+            this.state.gipManualResult,
+            this.state.gipEntryNote,
+            this.state.photo,
+            tmpDateTime.getTime(),
+            (error) => {alert(error)},
+            () => {
+              GlutonManager.getInstance().setMessage(2);
+              GearManager.getInstance().sendMessage("msg 31")
+            }
+          );
+        // }
+        if (goHome) {
+          setTimeout(() => this.navigateHome(), 100);
+        }
+    }
+
+    handleCancelButton() {
+        if (this.state.modified == true) {
+            this.showBackDiscardDialog()
+        } else {
+            this.navigateHome()
+        }
+    }
+
+    navigateHome() {
+        this.props.navigation.goBack();
+    }
+
+    showBackDiscardDialog() {
+        this.setState({ cancelSaveDialogVisible: true });
+    };
+
+    showSaveEmptyDialog(){
+        this.setState({ saveAsEmptyGIPDialogVisible: true });
+    }
+
+    handleBack() {
+        this.setState({ cancelSaveDialogVisible: false });
+        this.setState({ saveAsEmptyGIPDialogVisible: false });
+    };
+
+    handleDiscard() {
+        this.setState({ cancelSaveDialogVisible: false });
+        this.setState({ saveAsEmptyGIPDialogVisible: false });
+        this.navigateHome()
+    };
+
+
+    render() {
+
+        const marginToUse = ((this.state.keyboardOpen) ? 300 : 0);
+        const tags = [LanguageManager.getInstance().getText("GLUTEN"), LanguageManager.getInstance().getText("NO_GLUTEN"), LanguageManager.getInstance().getText("UNSURE")];
+        const meals = [LanguageManager.getInstance().getText("BREAKFAST"), LanguageManager.getInstance().getText("LUNCH"), LanguageManager.getInstance().getText("DINNER"), LanguageManager.getInstance().getText("SNACK")];
+        return (
+            <ScrollView style={{marginBottom: marginToUse}}>
+                <HorizontalLineWithText text = {LanguageManager.getInstance().getText("DATE")}/>
+                <DayChooser ref={component => this._dayChooser = component} date = {this.state.selectedDateAndTime} onDateChanged={this.dateEditedHandler}/>
+                <HorizontalLineWithText text = {LanguageManager.getInstance().getText("TIME")}/>
+                <TimePicker ref={component => this._timePicker = component} textString = "TAKEN_AT" onTimeChanged={this.timeEditedHandler}/>
+                <HorizontalLineWithText text = {LanguageManager.getInstance().getText("IMAGE")}/>
+                <View style={{alignItems: 'center'}}>
+                    <FoodDiaryImageEdit navigation = {this.props.navigation} onPictureTaken={(image) => this.setState({photo: image, modified: true})}/>
+                </View>
+                <HorizontalLineWithText text = {LanguageManager.getInstance().getText("TAGS")}/>
+                <FoodDiaryTagEdit ref={component => this._class = component} all={tags} selected={this.state.gipManualResult} isExclusive={true} onTagChanged={this.gipManualResultHandler}/>
+                <HorizontalLineWithText text = {LanguageManager.getInstance().getText("NOTES")} style={{Top: 10}}/>
+                <NoteEdit ref={component => this._noteEdit = component} note={this.state.symptomEntryNote} onTextChanged={this.noteEditedHandler} style={{Top: 10}}/>
+                <View>
+                    <Dialog.Container visible={this.state.saveAsEmptyGIPDialogVisible}>
+                        <Dialog.Title>{LanguageManager.getInstance().getText("SAVE_EMPTY_GIP")}</Dialog.Title>
+                        <Dialog.Description>
+                        {LanguageManager.getInstance().getText("WANT_TO_SAVE_EMPTY_GIP")}
+                        </Dialog.Description>
+                        <Dialog.Button label={LanguageManager.getInstance().getText("No")} onPress={() => this.handleBack()} />
+                        <Dialog.Button label={LanguageManager.getInstance().getText("YES")} onPress={() => this.saveData(true)} />
+                    </Dialog.Container>
+                </View>
+                <View>
+                    <Dialog.Container visible={this.state.cancelSaveDialogVisible}>
+                        <Dialog.Title>{LanguageManager.getInstance().getText("DISCARD")}</Dialog.Title>
+                        <Dialog.Description>
+                        {LanguageManager.getInstance().getText("DO_YOU_WANT_TO_DISCARD")}
+                        </Dialog.Description>
+                        <Dialog.Button label={LanguageManager.getInstance().getText("No")} onPress={() => this.handleBack()} />
+                        <Dialog.Button label={LanguageManager.getInstance().getText("YES")} onPress={() => this.handleDiscard()} />
+                    </Dialog.Container>
+                </View>
+            </ScrollView>
+        )
+    }
+
+}
+
+    
+    var styles = StyleSheet.create({
+     headText:{
+        fontSize: 20,
+        textAlign: 'center',
+        margin: 10
+     },
+    });
\ No newline at end of file
diff --git a/src/screens/GIPViewScreen.js b/src/screens/GIPViewScreen.js
new file mode 100644
index 000000000..e87cfb6de
--- /dev/null
+++ b/src/screens/GIPViewScreen.js
@@ -0,0 +1,134 @@
+import React from 'react';
+import { ScrollView, View, Text, StyleSheet } from 'react-native';
+import LanguageManager from '../manager/LanguageManager';
+import HeaderMenuButton from '../components/HeaderMenuButton';
+import DatabaseManager from '../manager/DatabaseManager';
+import GlutonManager from '../manager/GlutonManager';
+import Dialog from "react-native-dialog";
+import FoodDiaryImageEdit from '../components/FoodDiary/FoodDiaryImageEdit'
+import HorizontalLineWithText from '../components/HorizontalLineWithText';
+import FoodDiaryRatingBar from '../components/FoodDiary/FoodDiaryRatingBar';
+import ResultBlock from '../components/ResultDisplay'; 
+import FoodDiaryTagEdit from '../components/FoodDiary/FoodDiaryTagEdit'
+
+export default class FoodViewScreen extends React.Component {
+    static navigationOptions = ({navigation}) => ({
+        title: LanguageManager.getInstance().getText("VIEW_GIP_RESULT")
+    })
+
+    state = {
+        event: this.props.navigation.getParam("event"),
+        edit: false,
+        showDeleteConfirmDialog: false,
+    }
+
+    componentDidMount() {
+        this.props.navigation.setParams({ 
+            onHeaderMenuSelected: this.onHeaderMenuSelected.bind(this) ,
+            // onCancelPressed: this.handleCancelButton.bind(this),
+        })
+    }
+
+    onHeaderMenuSelected(index) {
+        switch (index) {
+          case 0: break; // this.setState({edit: true})
+          case 1: this.setState({showDeleteConfirmDialog: true}); break;
+        }
+    }
+
+    deleteEntry() {
+        DatabaseManager.getInstance().deleteEvent(this.state.event.id, 
+            (error) => {alert(error)}, 
+            () => {
+                GlutonManager.getInstance().setMessage(4);
+                this.props.navigation.goBack();
+            }
+        );
+    }
+
+    render() {
+        let objData = JSON.parse(this.state.event.objData);
+
+        var resultDate = objData.timestamp;
+
+        var displayBlock = {
+            resultValue: 'Negative',
+            accuracyPercentText: 100,
+            dateValue: new Date(resultDate).getUTCDate() + '/' +  (new Date(resultDate).getUTCMonth()+1) + '/' +  new Date(resultDate).getUTCFullYear(),
+            timeValue: new Date(resultDate).getUTCHours() + ':' + new Date(resultDate).getUTCMinutes(),
+            resultState: objData.result
+        };
+
+        switch(objData.result) {
+            case 0:
+                displayBlock.resultValue = 'Gluten';
+                displayBlock.accuracyPercentText = 100;
+                displayBlock.resultState = 1;
+              break;
+            case 1:
+                displayBlock.resultValue = 'No gluten';
+                displayBlock.accuracyPercentText = 100;
+                displayBlock.resultState = 0;
+              break;
+            case 2:
+                displayBlock.resultValue = 'Inconclusive';
+                displayBlock.accuracyPercentText = 50;
+                displayBlock.resultState = 2;
+               break;
+            default:
+                displayBlock.resultValue = 'Inconclusive';
+                displayBlock.accuracyPercentText = 50;
+                displayBlock.resultState = 2;
+          }
+        const tags = [
+          LanguageManager.getInstance().getText("GLUTEN"),
+          LanguageManager.getInstance().getText("NO_GLUTEN"),
+          LanguageManager.getInstance().getText("UNSURE")
+        ];
+        
+        return (
+            <ScrollView>
+                <View style={{alignItems: 'center'}}>
+                    <FoodDiaryImageEdit snapshot={objData.photo} active={false} size="medium" />
+                </View>
+                <HorizontalLineWithText text={LanguageManager.getInstance().getText("DATE")}/>
+                <View style={{paddingBottom: 10}} />
+                <ResultBlock dataBlock={displayBlock}></ResultBlock>
+                <HorizontalLineWithText text = {LanguageManager.getInstance().getText("NOTES")}/>
+                <View style={{paddingBottom: 10}}/>
+                <View>
+                  <Dialog.Container visible={this.state.showDeleteConfirmDialog}>
+                    <Dialog.Title>{LanguageManager.getInstance().getText("DELETE")}</Dialog.Title>
+                    <Dialog.Description>
+                      {LanguageManager.getInstance().getText("DO_YOU_WANT_TO_DELETE")}
+                    </Dialog.Description>
+                    <Dialog.Button
+                      label={LanguageManager.getInstance().getText("BACK")}
+                      onPress={() => this.setState({showDeleteConfirmDialog: false})} />
+                    <Dialog.Button label={LanguageManager.getInstance().getText("DELETE")} onPress={() => this.deleteEntry()} />
+                  </Dialog.Container>
+                </View>
+            </ScrollView>
+        )
+    }
+}
+
+
+const styles = StyleSheet.create({
+    headText:{
+       fontSize: 20,
+       textAlign: 'center',
+       margin: 10
+    },
+});
+//Expected Datablock Template
+/**
+ * 
+ * var displayBlock = {
+  resultValue: 20,
+  accuracyPercentText: 2220,
+  dateValue: '12/12/12',
+  timeValue: '12:12',
+  resultState: 3
+}
+ */
\ No newline at end of file
diff --git a/src/screens/GlutenbuddyRoot.js b/src/screens/GlutenbuddyRoot.js
new file mode 100644
index 000000000..69c771d26
--- /dev/null
+++ b/src/screens/GlutenbuddyRoot.js
@@ -0,0 +1,313 @@
+import React from "react";
+import {
+  View,
+  Text,
+  StyleSheet,
+  TouchableOpacity,
+  Image,
+  ImageBackground,
+} from "react-native";
+import * as Progress from "react-native-progress";
+import AchievementManager from "../manager/buddyManager/AchievementManager";
+
+import MenuButton from "../components/MenuButton";
+import { Avatar } from "../components/Glutenbuddy/avataaars-lib/react-native-avataaars/dist";
+import {
+  createStackNavigator,
+  createAppContainer,
+  NavigationEvents,
+} from "react-navigation";
+
+import { observer } from "mobx-react";
+import store from "../manager/buddyManager/GlutenBuddyStore";
+import emotionStore from "..//manager/buddyManager/EmotionStore";
+import Wardrobe from "../components/Glutenbuddy/screens/Wardrobe";
+
+// Screens:
+import Challenges from "../components/Glutenbuddy/screens/Challenges";
+import Achievements from "../components/Glutenbuddy/screens/Achievements";
+import ChallengesTest from "../components/Glutenbuddy/screens/ChallengesTest";
+
+// required for Navigation:
+import EvaluationScreen from "../screens/EvaluationScreen";
+import HomeScreen from "../screens/HomeScreen";
+import CalendarScreen from "../screens/CalendarScreen";
+import DebugScreen from "../screens/DebugScreen";
+import SymptomTrackerScreen from "../screens/SymptomTrackerScreen";
+import FoodDiaryScreen from "../screens/FoodDiaryScreen";
+import GIPScreen from "../screens/GIPScreen";
+import EmoteTrackerScreen from "../screens/EmoteTrackerScreen";
+import SymptomViewScreen from "../screens/SymptomViewScreen";
+import FoodViewScreen from "../screens/FoodViewScreen";
+import GIPViewScreen from "../screens/GIPViewScreen";
+import EmoteViewScreen from "../screens/EmoteViewScreen";
+import SettingsScreen from "../screens/SettingsScreen";
+import CameraScreen from "../screens/CameraScreen";
+import GearScreen from "../screens/GearScreen";
+import SymptomTrackerMoreSymptomsScreen from "../screens/SymptomTrackerMoreSymptomsScreen";
+import SymptomTrackerAddNewScreen from "../screens/SymptomTrackerAddNewScreen";
+import EmoteTrackerSymbol from "../components/EmoteTracker/EmoteTrackerSymbol";
+import EmotionDisplayIcon from "../components/EmotionDisplayIcon";
+import loggingStore from "../../src/manager/buddyManager/LoggingStore";
+import CeliLogger from '../analytics/analyticsManager';
+import { showMessage } from "react-native-flash-message";
+
+@observer
+export default class GlutenbuddyRoot extends React.Component {
+
+  static navigationOptions = ({ navigation }) => ({
+    title: "Glutenbuddy",
+  });
+
+  componentDidMount() {
+    this.props.navigation.addListener('willFocus', () => {
+      CeliLogger.addLog(this.constructor.name, "tapped");
+    });
+  }
+
+  async refreshState() {
+    var score = await AchievementManager.getLevelPoints();
+    var level = await AchievementManager.getCurrentLevel();
+    store.setCurrentLevel(level);
+    store.setScore(score);
+    var levelBounds = await AchievementManager.getCurrentLevelBounds();
+    levelBounds[0] = Math.round(levelBounds[0]);
+    levelBounds[1] = Math.round(levelBounds[1]);
+    store.setThisLevelBegin(levelBounds[0]);
+    store.setThisLevelEnd(levelBounds[1]);
+    let progressPercent = this.calcValuesForProgressBar(levelBounds, score);
+    store.setProgressBarProgress(progressPercent);
+  }
+
+
+  render() {
+    var barstyle = {
+      opacity: 0.0,
+      paddingTop: 20,
+      alignItems: "center",
+      justifyContent: "center",
+    };
+    if (loggingStore.gamificationFlag) {
+      barstyle.opacity = 1;
+    };
+    return (
+      <View style={styles.container}>
+        <NavigationEvents onDidFocus={() => this.refreshState()} />
+        <ImageBackground
+          source={require("../assets/images/avatar_menu/landscape_background.png")}
+          style={styles.backgroundimage}
+          imageStyle={{ opacity: 0.3 }}
+        >
+          <View style={styles.innerView, barstyle}>
+            <Text>
+              Level {store.currentLevel}
+              {/** {"\n"} {store.score} / {store.thisLevelEnd} */}
+            </Text>
+            <Progress.Bar
+              style={styles.progressbar}
+              progress={store.progressBarProgress}
+              width={200}
+              height={15}
+            />
+          </View>
+          <TouchableOpacity
+            style={styles.centerComponent}
+            delayLongPress={5000}
+            onPress={() => {
+              if (loggingStore.gamificationFlag) {
+                this.props.navigation.navigate("Wardrobe")
+              }
+            }}
+            onLongPress={() => {
+              if (!loggingStore.gamificationFlag) {
+                loggingStore.changeGamificationFlag();
+                showMessage({
+                  message: "Gamification activated!",
+                  description: "You have just activated Gamification!",
+                  type: "success"
+                });
+                CeliLogger.addLog(this.constructor.name, "gamification enabled!");
+              } else {
+                loggingStore.changeGamificationFlag();
+                showMessage({
+                  message: "Gamification deactivated!",
+                  description: "You have just deactivated Gamification!",
+                  type: "success"
+                });
+                CeliLogger.addLog(this.constructor.name, "gamification disabled!");
+              }
+            }}
+          >
+            <Avatar
+              size={store.size}
+              style={styles.avatar}
+              avatarStyle={store.avatarStyle}
+              topType={store.topType}
+              hairColor={store.hairColor}
+              facialHairType={store.facialHairType}
+              clotheType={store.clotheType}
+              clotheColor={store.clotheColor}
+              skinColor={store.skinColor}
+              accessoriesType={store.accessoriesType}
+              eyeType={emotionStore.eyeType}
+              eyebrowType={emotionStore.eyebrowType}
+              mouthType={emotionStore.mouthType}
+            />
+            <EmotionDisplayIcon style={styles.emotiondisplay} emotionId={emotionStore.getCurrentEmotion()}></EmotionDisplayIcon>
+          </TouchableOpacity>
+          <MenuButton navigation={this.props.navigation} />
+        </ImageBackground>
+      </View>
+    );
+  }
+  calcValuesForProgressBar(bounds, currentScore) {
+    let progressThisLevel = currentScore - bounds[0];
+    let progressPercent =
+      Math.round(progressThisLevel + Number.EPSILON) / (bounds[1] - bounds[0]);
+    return progressPercent;
+  }
+}
+
+// reuse of existing stackNavigator (MainTabNavigator) results in error msg
+const RootStack = createStackNavigator({
+  GlutenbuddyRoot: GlutenbuddyRoot,
+  Wardrobe: Wardrobe,
+  Challenges: Challenges,
+  ChallengesTest: ChallengesTest,
+  Achievements: {
+    screen: Achievements,
+  },
+  AddSymptom: {
+    screen: SymptomTrackerScreen,
+  },
+  MoreSymptoms: {
+    screen: SymptomTrackerMoreSymptomsScreen,
+  },
+  AddNewSymptom: {
+    screen: SymptomTrackerAddNewScreen,
+  },
+  ViewSymptom: {
+    screen: SymptomViewScreen,
+  },
+  AddMeal: {
+    screen: FoodDiaryScreen,
+  },
+  ViewMeal: {
+    screen: FoodViewScreen,
+  },
+  AddEmote: {
+    screen: EmoteTrackerScreen,
+  },
+  AddGIP: {
+    screen: GIPScreen,
+  },
+  ViewGIP: {
+    screen: GIPViewScreen,
+  },
+  ViewEmote: {
+    screen: EmoteViewScreen,
+  },
+  Settings: {
+    screen: SettingsScreen,
+  },
+  Debug: {
+    screen: DebugScreen,
+  },
+  Camera: {
+    screen: CameraScreen,
+  },
+  Gear: {
+    screen: GearScreen,
+  },
+});
+
+const AppContainer = createAppContainer(RootStack);
+
+export class App extends React.Component {
+  render() {
+    return <AppContainer />;
+  }
+}
+
+const styles = StyleSheet.create({
+  background: {
+    width: "100%",
+    height: "100%",
+  },
+  popup: {
+    position: "absolute",
+    right: 40,
+    top: 40,
+  },
+  gluton: {
+    //position: 'absolute',
+    top: "25%",
+    //left: '25%',
+    width: "100%",
+    alignItems: "center",
+  },
+  container: {
+    flex: 1,
+    backgroundColor: "#fff",
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  wardrobe: {
+    flex: 1,
+  },
+  actionButtonIcon: {
+    fontSize: 20,
+    height: 22,
+    color: "white",
+  },
+  parent: {
+    alignItems: "center",
+    justifyContent: "center",
+    width: "80%",
+    flexDirection: "row",
+    flexWrap: "wrap",
+  },
+  touchable: {
+    width: "34%",
+    margin: "4%",
+    aspectRatio: 1,
+    alignItems: "center",
+    justifyContent: "center",
+    backgroundColor: "transparent",
+  },
+  child: {
+    //flex:1,
+    width: "100%",
+    height: "100%",
+  },
+  images: {
+    flex: 1,
+    width: "100%",
+    height: "100%",
+  },
+  backgroundimage: {
+    width: "100%",
+    height: "100%",
+    resizeMode: "cover",
+    //backgroundColor:'rgba(255,0,0,0.5)', //
+    //opacity: 0.5
+  },
+  centerComponent: {
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  progressbar: {
+    width: "44%",
+  },
+  innerView: {
+    paddingTop: 20,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  avatar: {
+    flex: 0.8
+  },
+  emotiondisplay: {
+    flex: 0.2
+  }
+});
diff --git a/src/screens/HomeScreen.js b/src/screens/HomeScreen.js
index c89f155d0..31b5a07ce 100644
--- a/src/screens/HomeScreen.js
+++ b/src/screens/HomeScreen.js
@@ -10,6 +10,8 @@ import Gluton from "../components/Gluton";
 import MenuButton from '../components/MenuButton';
 import PopUpMenu from '../components/PopUpMenu';
 import LanguageManager from '../manager/LanguageManager';
+import CircleDisplayFull from '../components/CircleDisplayFull';
+
 
 export default class HomeScreen extends React.Component {
   onPopupEvent(eventName, index) {
@@ -24,21 +26,26 @@ export default class HomeScreen extends React.Component {
       default: this.props.navigation.navigate('Debug'); break;
     }
   }
-
+  
   render() {
-    let popupNames = [
-      LanguageManager.getInstance().getText("SETTINGS"),
-      //LanguageManager.getInstance().getText("CAMERA"),
-      //LanguageManager.getInstance().getText("DEBUG"),
-      LanguageManager.getInstance().getText("GEAR"),
-    ];
-
     return (
-      <ImageBackground source={Background} style={styles.background}>
-        <Gluton style={styles.gluton}/>
-        <PopUpMenu style={styles.popup} actions={popupNames} onPress={(name, index) => this.onPopupEvent(name, index)} />
-        <MenuButton navigation={this.props.navigation}/>
-      </ImageBackground>
+      <View style={styles.background}>
+        <CircleDisplayFull 
+                progBarX={75}
+                progBarY={130}
+                progBarBorderWidth={35}
+                progBarBigRadius={130}
+                progBarSmallRadius={12}
+                NoInputColour={'grey'} 
+                GlutenColour={'red'} 
+                NoGlutenColour={'green'} 
+                SymptomOnlyColour={'blue'} 
+                FinishedBackGroundColour={'#3399FF'}
+                UnfinishedBackGroundColour={'#999'}
+                InsideCircleBGColour={'#fff'}
+        /> 
+         <MenuButton navigation={this.props.navigation}/>
+      </View>
 	  );
   }  
 }
diff --git a/src/screens/LoadingScreen.js b/src/screens/LoadingScreen.js
index 32e50d07b..834076a8b 100644
--- a/src/screens/LoadingScreen.js
+++ b/src/screens/LoadingScreen.js
@@ -1,6 +1,9 @@
 import React from 'react';
 import { Text, View, Image, Animated, StyleSheet, Easing , Dimensions } from 'react-native';
 
+import Constants from 'expo-constants';
+import AchievementRecordManager from '../manager/buddyManager/AchievementRecordManager';
+
 export default class LoadingScreen extends React.Component {
 
   constructor() {
@@ -16,7 +19,7 @@ export default class LoadingScreen extends React.Component {
     this.RotateValueHolder.setValue(0);
     Animated.timing(this.RotateValueHolder, {
       toValue: 1,
-      duration: 2000,
+      duration: 1000,
       easing: Easing.linear,
     }).start(() => this.StartImageRotateFunction());
   }
@@ -30,9 +33,13 @@ export default class LoadingScreen extends React.Component {
       inputRange: [0, 1],
       outputRange: ['0deg', '360deg'],
     });
-
     return (
-      <View style={{width: Dimensions.get('window').width, height: Dimensions.get('window').height, justifyContent: 'space-around', alignItems: 'center'}}>
+      <View style={{
+        width: Dimensions.get('window').width,
+        height: Dimensions.get('window').height,
+        justifyContent: 'space-around',
+        alignItems: 'center'
+      }}>
         <Text style={{fontSize: 40, fontWeight: 'bold'}}>CeliApp</Text>
         <Animated.Image
           style={{
@@ -42,7 +49,8 @@ export default class LoadingScreen extends React.Component {
           }}
           source={require('../assets/images/celiapp_icon_trans.png')}
         />
-        <Text style={{color: 'green'}}> - Glutenfree is what you want to be - </Text>
+        <Text style={{color: 'green'}}>Glutenfree is what you want to be</Text>
+        <Text style={{fontSize: 12, color: 'gray'}}>Version {Constants.manifest.version}</Text>
       </View>
     );
   }
diff --git a/src/screens/SymptomTrackerAddNewScreen.js b/src/screens/SymptomTrackerAddNewScreen.js
index cea38580d..e1269d0c1 100644
--- a/src/screens/SymptomTrackerAddNewScreen.js
+++ b/src/screens/SymptomTrackerAddNewScreen.js
@@ -6,6 +6,9 @@ import TextInputSingleLine from '../components/TextInputSingleLine';
 import HeaderSaveButton from '../components/HeaderSaveButton';
 import DatabaseManager from '../manager/DatabaseManager';
 import USER_SYMPTOM_ICON from '../assets/images/SymptomTracker/userDefinedSymptom.png';
+import EntryManager from '../manager/buddyManager/EntryManager';
+import AchievementManager from '../manager/buddyManager/AchievementManager';
+import AchievementRecordManager from '../manager/buddyManager/AchievementRecordManager';
 
 export default class SymptomTrackerAddNewScreen extends React.Component{
     static navigationOptions = ({navigation}) => ({
@@ -37,8 +40,10 @@ export default class SymptomTrackerAddNewScreen extends React.Component{
     }
 
     saveCurrentData = (goHome) =>{
+        //Achievement Addition
+        AchievementManager.triggerAchievement("SYMPTOMADDED");
+        AchievementRecordManager.increaseCountForAchievementRecord('SYMPTOMADDED');
         DatabaseManager.getInstance().createSymptom(this.state.nameString, USER_SYMPTOM_ICON, (error) => {alert(error)}, null);
-
         if (goHome) {
             setTimeout(() => this.navigateHome(), 100);
         }
@@ -52,22 +57,29 @@ export default class SymptomTrackerAddNewScreen extends React.Component{
 
     render(){
         return(
-            <View>
-                <View style={{flexDirection: "row", justifyContent: "space-between", alignItems: 'center', width: Dimensions.get('window').width, height: 80}}>
-                    <Text style={styles.TextStyle}>Name: </Text>
-                    <View style={{width:Dimensions.get('window').width-80, paddingBottom: 18}}>
-                        <TextInputSingleLine ref={component => this._search = component} onTextChanged={this.nameEditedHandler}/>
-                    </View>
-                </View>       
-            </View>
+          <View style={[styles.container, { width: Dimensions.get('window').width }]}>
+              <Text style={styles.text}>Name: </Text>
+              <View style={[styles.textInputContainer, { width: Dimensions.get('window').width - 100 }]}>
+                  <TextInputSingleLine ref={component => this._search = component} onTextChanged={this.nameEditedHandler}/>
+              </View>
+          </View>
         )
     }
 
 }
 
 var styles = StyleSheet.create({
-    TextStyle:{
-       fontSize: 15,
-       fontWeight: 'bold',
-    }
-   });
\ No newline at end of file
+  container: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    height: 80,
+    margin: 25
+  },
+  text: {
+     fontSize: 15,
+     fontWeight: 'bold',
+  },
+  textInputContainer: {
+    paddingBottom: 18
+  }
+});
diff --git a/src/screens/SymptomTrackerMoreSymptomsScreen.js b/src/screens/SymptomTrackerMoreSymptomsScreen.js
index e038c71c2..b42eb4616 100644
--- a/src/screens/SymptomTrackerMoreSymptomsScreen.js
+++ b/src/screens/SymptomTrackerMoreSymptomsScreen.js
@@ -19,7 +19,6 @@ export default class SymptomTrackerMoreSymptomsScreen extends React.Component{
         super(props)
         this.symptomSelectionChangeHandler = this.symptomSelectionChangeHandler.bind(this);
         this.state={
-            tempDate: new Date(), //used to temporarliy save date and then set it to selectedDateAndTime after corresponding checks
             selectedSymptoms: this.props.navigation.getParam("symptoms"),
         }
 
diff --git a/src/screens/SymptomTrackerScreen.js b/src/screens/SymptomTrackerScreen.js
index e7cfc68a9..b62282869 100644
--- a/src/screens/SymptomTrackerScreen.js
+++ b/src/screens/SymptomTrackerScreen.js
@@ -1,7 +1,8 @@
 import React from 'react';
-import { ScrollView, Keyboard, View, Button, Alert, TextInput, StyleSheet, BackHandler } from 'react-native';
+import { Keyboard, View, Button, Alert, TextInput, StyleSheet, BackHandler } from 'react-native';
 import { HeaderBackButton } from 'react-navigation'
 import Dialog from "react-native-dialog";
+import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view'
 import SymptomGroup from '../components/SymptomTracker/SymptomGroup';
 import NoteEdit from '../components/NoteEdit';
 import DayChooser from '../components/DayChooser';
@@ -12,18 +13,24 @@ import LanguageManager from '../manager/LanguageManager';
 import GlutonManager from '../manager/GlutonManager';
 import HeaderSaveButton from '../components/HeaderSaveButton';
 import GearManager from '../manager/GearManager';
+import AchievementManager from '../manager/buddyManager/AchievementManager';
+import AchievementRecordManager from '../manager/buddyManager/AchievementRecordManager';
+import CeliLogger from '../analytics/analyticsManager';
 
 
 export default class SymptomTrackerScreen extends React.Component{
-    static navigationOptions = ({navigation}) => ({
-        title: LanguageManager.getInstance().getText("ADD_SYMPTOM"),
-        headerLeft: <HeaderBackButton onPress={() => navigation.state.params.onCancelPressed()}/>,
-        headerRight: <HeaderSaveButton onPress={() => navigation.state.params.onOkPressed(true)}/>
-    })
-
-
-    //_didFocusSubscription;
-    //_willBlurSubscription;
+    static navigationOptions = ({navigation}) => {
+        const {state} = navigation;
+        if(state.params != undefined && state.params.onSymptomsUpdated != undefined) {
+            return {
+                title: LanguageManager.getInstance().getText("ADD_SYMPTOM"),
+                headerLeft: <HeaderBackButton onPress={() => navigation.state.params.onCancelPressed()} />,
+                headerRight: <HeaderSaveButton onPress={() => navigation.state.params.onOkPressed(true)} shareConfig={{
+                    onSymptomsUpdated: state.params.onSymptomsUpdated
+                }} />
+            }
+        }
+    }
 
     constructor(props) {
         super(props);
@@ -33,18 +40,20 @@ export default class SymptomTrackerScreen extends React.Component{
         this.symptomSelectionChangeHandler = this.symptomSelectionChangeHandler.bind(this);
         this.state = {
             symptomEntryNote: "", //works correctly \o/
-            tempDate: new Date(), //used to temporarliy save date and then set it to selectedDateAndTime after corresponding checks
-            selectedDateAndTime: new Date(), //works correctly \o/
             selectedSymptoms: [], //bit buggy when deleting existing symptoms from list
             dayChangeDialogVisible: false,
             resetSymptomGroup: false,
             cancelSaveDialogVisible: false,
+            selectSymptomDialogVisible: false,
             keyboardOpen: false
-        } 
+        }
+    }
 
-        // this._didFocusSubscription = props.navigation.addListener('didFocus', payload =>
-        //     BackHandler.addEventListener('hardwareBackPress', this.onBackButtonPressAndroid)
-        // );
+    componentWillMount() {
+        this.setState({
+            selectedDateAndTime: this.props.navigation.state.params.selectedDateAndTime
+        });
+        CeliLogger.addLog(this.constructor.name, "opened");
     }
 
     componentDidMount() {
@@ -53,155 +62,91 @@ export default class SymptomTrackerScreen extends React.Component{
     //     );
         
         this.props.navigation.setParams({ 
-            onOkPressed: this.saveCurrentData.bind(this) ,
-            onCancelPressed: this.handleCancelButton.bind(this) ,
-        })
+            onOkPressed: this.saveCurrentData.bind(this),
+            onCancelPressed: this.handleCancelButton.bind(this),
+            onSymptomsUpdated: this.onSymptomsUpdated.bind(this)
+        });
 
         this.keyboardDidShowListener = Keyboard.addListener(
             'keyboardDidShow',
             this._keyboardDidShow,
-          );
-          this.keyboardDidHideListener = Keyboard.addListener(
+        );
+        this.keyboardDidHideListener = Keyboard.addListener(
             'keyboardDidHide',
             this._keyboardDidHide,
-          );
+        );
 
     }
 
     componentWillUnmount() {
         this.keyboardDidShowListener.remove();
         this.keyboardDidHideListener.remove();
-      }
+        CeliLogger.addLog(this.constructor.name, "closed");
+    }
 
-      _keyboardDidShow = ()  => {
+    _keyboardDidShow = () => {
         this.setState({
             keyboardOpen: true,
         })
-      }
-    
-      _keyboardDidHide = ()  => {
+    }
+
+    _keyboardDidHide = () => {
         this.setState({
             keyboardOpen: false,
         })
-      }
-
-    // onBackButtonPressAndroid = () => {
-    //     alert("B")
-    // };
-
-    // componentWillUnmount() {
-    //     this._didFocusSubscription && this._didFocusSubscription.remove();
-    //     this._willBlurSubscription && this._willBlurSubscription.remove();
-    // }
-
+    }
 
     clearNoteText = () => {
-         this.setState({
-             symptomEntryNote: ""
-         })
+        this.setState({
+            symptomEntryNote: ""
+        })
         this._noteEdit.deleteNote();
-      }
+    }
 
+    onSymptomsUpdated = (callback) => {
+        this.symptomsUpdated = callback;
+    }
 
-      clearSymptomGroup = () =>{
+    clearSymptomGroup = () => {
         this.setState({
             selectedSymptoms: []
         })
         this._symptomGroup.deleteSymptoms();
-      }
-
+    }
 
-    noteEditedHandler(note){
+    noteEditedHandler(note) {
         this.setState({
             selectedSymptoms: []
         })
         this._symptomGroup.deleteSymptoms();
-      }
+    }
 
 
-      setBackDayChooserOneDay = () =>{
+    setBackDayChooserOneDay = () => {
         this._dayChooser.changeDay(false);
-      }
-
-
-
+    }
 
-      showBackDiscardDialog = () => {
+    showBackDiscardDialog = () => {
         this.setState({ cancelSaveDialogVisible: true });
-      };
+    };
 
-      handleBack = () => {
+    handleBack = () => {
         this.setState({ cancelSaveDialogVisible: false });
-      };
+    };
 
-      handleDiscard = () => {
+    handleDiscard = () => {
         this.navigateHome()
         this.setState({ cancelSaveDialogVisible: false });
-      };
-
-
-
-
-
-
-
-
-
-      showDayChangeSaveDialog = () => {
-        this.setState({ dayChangeDialogVisible: true });
-      };
-
-     
-      handleDayChangeCancel = () => {
-          //do nothing, dont change date
-          this.setBackDayChooserOneDay()
-        this.setState({ dayChangeDialogVisible: false });
-      };
-     
-      handleDayChangeSave = () => {
-        //Save Data and go on to next date
-
-        //Alert.alert("onDateEditedHandler called");
-        // //Only update the date of the current selectedDateAndTime
-        let tmpDateTime = this.state.selectedDateAndTime
-        // //TODO: Change date of 
-        tmpDateTime.setDate(this.state.tempDate.getDate())
-        tmpDateTime.setMonth(this.state.tempDate.getMonth())
-        tmpDateTime.setYear(this.state.tempDate.getYear())
-
-        this.saveCurrentData(false)
-
-
-        //delete data
-
-        this.setState({ 
-            selectedDateAndTime: tmpDateTime,
-            dayChangeDialogVisible: false, 
-        });
-
-        this.clearNoteText()
-        this.clearSymptomGroup()
-      };
-
-     
-
+    };
 
-
-
-
-
-
-
-
-    noteEditedHandler = (note) =>{
+    noteEditedHandler = (note) => {
         this.setState({
             symptomEntryNote: note,
         });
     }
 
-    dateEditedHandler = (dateTime) =>{
+    dateEditedHandler = (dateTime) => {
         //TODO: if symptoms selected and not saved, ask user. Then refresh page.
-        this.state.tempDate = dateTime
 
         let tmpDateTime = this.state.selectedDateAndTime
         tmpDateTime.setDate(dateTime.getDate())
@@ -210,21 +155,9 @@ export default class SymptomTrackerScreen extends React.Component{
         this.setState({
             selectedDateAndTime: tmpDateTime,
         })
-        if(Array.isArray(this.state.selectedSymptoms) && this.state.selectedSymptoms.length){
-            this.showDayChangeSaveDialog()
-        }else{
-            //symptoms were not edited, but maybe the note. Delete note and update noteEdit
-            this.setState({
-                symptomEntryNote: ""
-            })
-            this.clearNoteText()
-        }
     }
 
-
-    timeEditedHandler = (dateTime) =>{
-        // //Only update the time of the current selectedDateAndTime
-
+    timeEditedHandler = (dateTime) => {
         let tmpDateTime = this.state.selectedDateAndTime
         tmpDateTime.setHours(dateTime.getHours())
         tmpDateTime.setMinutes(dateTime.getMinutes())
@@ -235,107 +168,98 @@ export default class SymptomTrackerScreen extends React.Component{
         })
     }
 
-    symptomSelectionChangeHandler = (sympIDsAndSeverity) =>{
-        // alert(JSON.stringify(sympIDsAndSeverity));
+    symptomSelectionChangeHandler = (sympIDsAndSeverity) => {
+        this.symptomsUpdated(sympIDsAndSeverity.length > 0);
         this.setState({
             selectedSymptoms: sympIDsAndSeverity,
-        })
+        });
     }
 
-
-
-
-
-
-    render(){
-
+    render() {
         const marginToUse = ((this.state.keyboardOpen) ? 300 : 0);
 
             return(
-                <ScrollView style={{marginBottom: marginToUse}}>
-                    {/* <TextInput onSubmitEditing={Keyboard.dismiss} /> */}
-                    <HorizontalLineWithText text = {LanguageManager.getInstance().getText("DATE")}/>
-                    <DayChooser ref={component => this._dayChooser = component} date = {this.state.selectedDateAndTime} onDateChanged={this.dateEditedHandler}/>
-                    <HorizontalLineWithText text = {LanguageManager.getInstance().getText("TIME")}/>
-                    <TimePicker ref={component => this._timePicker = component} textString = "SYMPTOM_OCCURED" onTimeChanged={this.timeEditedHandler}/>
-                    <HorizontalLineWithText text = {LanguageManager.getInstance().getText("SYMPTOMS")}/>
-                    <SymptomGroup ref={component => this._symptomGroup = component} selection={this.state.selectedSymptoms} onSelectionChanged={this.symptomSelectionChangeHandler} navigation={this.props.navigation}/>
-                    <HorizontalLineWithText text = {LanguageManager.getInstance().getText("NOTES")}/>
-                    <NoteEdit ref={component => this._noteEdit = component} note={this.state.symptomEntryNote} onTextChanged={this.noteEditedHandler}/>
-                    <View style={{paddingBottom: 10}} />
-    
-                    {/*Dialog for Day Change Save Dialog*/}
-                    <View>
-                        <Dialog.Container visible={this.state.dayChangeDialogVisible}>
-                        <Dialog.Title>{LanguageManager.getInstance().getText("SAVE")}</Dialog.Title>
-                        <Dialog.Description>
-                            {LanguageManager.getInstance().getText("DO_YOU_WANT_TO_SAVE")}
-                        </Dialog.Description>
-                        <Dialog.Button label={LanguageManager.getInstance().getText("CANCEL")} onPress={this.handleDayChangeCancel} />
-                        <Dialog.Button label={LanguageManager.getInstance().getText("SAVE")} onPress={this.handleDayChangeSave} />
-                        </Dialog.Container>
-                    </View>
-    
-                    {/*Dialog for Day Change Save Dialog*/}
-                     <View>
-                        <Dialog.Container visible={this.state.cancelSaveDialogVisible}>
-                        <Dialog.Title>{LanguageManager.getInstance().getText("DISCARD")}</Dialog.Title>
-                        <Dialog.Description>
-                        {LanguageManager.getInstance().getText("DO_YOU_WANT_TO_DISCARD")}
-                        </Dialog.Description>
-                        <Dialog.Button label={LanguageManager.getInstance().getText("BACK")} onPress={this.handleBack} />
-                        <Dialog.Button label={LanguageManager.getInstance().getText("DISCARD")} onPress={this.handleDiscard} />
-                        </Dialog.Container>
-                    </View>
-                    {/* <KeyboardListener
-                        onWillShow={() => { this.setState({ keyboardOpen: true }); }}
-                        onWillHide={() => { this.setState({ keyboardOpen: false }); }}
-                    /> */}
-                </ScrollView>
-            )
+                <View style={styles.container}>
+                  <KeyboardAwareScrollView>
+                      {/* <TextInput onSubmitEditing={Keyboard.dismiss} /> */}
+                      <HorizontalLineWithText text = {LanguageManager.getInstance().getText("DATE")}/>
+                      <DayChooser ref={component => this._dayChooser = component} date = {this.state.selectedDateAndTime} onDateChanged={this.dateEditedHandler}/>
+                      <HorizontalLineWithText text = {LanguageManager.getInstance().getText("TIME")}/>
+                      <TimePicker ref={component => this._timePicker = component} textString = "SYMPTOM_OCCURED" onTimeChanged={this.timeEditedHandler}/>
+                      <HorizontalLineWithText text = {LanguageManager.getInstance().getText("SYMPTOMS")}/>
+                      <SymptomGroup ref={component => this._symptomGroup = component} selection={this.state.selectedSymptoms} onSelectionChanged={this.symptomSelectionChangeHandler} navigation={this.props.navigation}/>
+                      <HorizontalLineWithText text = {LanguageManager.getInstance().getText("NOTES")}/>
+                      <NoteEdit ref={component => this._noteEdit = component} note={this.state.symptomEntryNote} onTextChanged={this.noteEditedHandler}/>
+                      <View style={{paddingBottom: 10}} />
+       
+                      {/*Dialog for Day Change Save Dialog*/}
+                       <View>
+                          <Dialog.Container visible={this.state.cancelSaveDialogVisible}>
+                          <Dialog.Title>{LanguageManager.getInstance().getText("DISCARD")}</Dialog.Title>
+                          <Dialog.Description>
+                          {LanguageManager.getInstance().getText("DO_YOU_WANT_TO_DISCARD")}
+                          </Dialog.Description>
+                          <Dialog.Button label={LanguageManager.getInstance().getText("BACK")} onPress={this.handleBack} />
+                          <Dialog.Button label={LanguageManager.getInstance().getText("DISCARD")} onPress={this.handleDiscard} />
+                          </Dialog.Container>
+                      </View>
+                      {/* <KeyboardListener
+                          onWillShow={() => { this.setState({ keyboardOpen: true }); }}
+                          onWillHide={() => { this.setState({ keyboardOpen: false }); }}
+                      /> */}
+                </KeyboardAwareScrollView>
+            </View>
+        )
     }
 
-    saveCurrentData = (goHome) =>{
-        let added = 1;
-        let tmpDateTime = this.state.selectedDateAndTime
-
-        this.state.selectedSymptoms.forEach((symptom) => {
-            DatabaseManager.getInstance().createSymptomEvent(symptom.symptomID, symptom.severity, this.state.symptomEntryNote, tmpDateTime.getTime(), 
-                (error) => {alert(error)}, 
-                () => {GlutonManager.getInstance().setMessage(2); GearManager.getInstance().sendMessage("msg 32")}
-            );
-        });
+    isSymptomSelected() {
+        return Array.isArray(this.state.selectedSymptoms) && this.state.selectedSymptoms.length > 0;
+    }
 
-        if (goHome) {
-            setTimeout(() => this.navigateHome(), 100);
+    saveCurrentData = (goHome) => {
+        let added = 1;
+        let tmpDateTime = this.state.selectedDateAndTime;
+
+        if (this.isSymptomSelected()) {
+            this.state.selectedSymptoms.forEach((symptom) => {
+                DatabaseManager.getInstance().createSymptomEvent(symptom.symptomID, symptom.severity, this.state.symptomEntryNote, tmpDateTime.getTime(),
+                    (error) => { alert(error) },
+                    () => { GlutonManager.getInstance().setMessage(2); GearManager.getInstance().sendMessage("msg 32") }
+                );
+                //Achievement Addition
+                AchievementManager.triggerAchievement("SYMPTOMADDED");
+                AchievementRecordManager.increaseCountForAchievementRecord('SYMPTOMADDED');
+            });
+
+            if (goHome) {
+                setTimeout(() => this.navigateHome(), 100);
+            }
+        } else {
+            this.showBackDiscardDialog();
         }
     }
 
-    navigateHome = () =>{
+    navigateHome = () => {
         this.props.navigation.goBack();
     }
 
-    handleCancelButton = () =>{
-        if(Array.isArray(this.state.selectedSymptoms) && this.state.selectedSymptoms.length){
+    handleCancelButton = () => {
+        if (Array.isArray(this.state.selectedSymptoms) && this.state.selectedSymptoms.length) {
             this.showBackDiscardDialog()
-        }else{
+        } else {
             this.navigateHome()
         }
     }
 
 }
 
-
-
-function getTodayDate(){
-    return new Date()
-}
-  
-
 var styles = StyleSheet.create({
- headText:{
-    fontSize: 20,
-    textAlign: 'center',
-    margin: 10
- }
-});
\ No newline at end of file
+    container: {
+        margin: 25
+    },
+    headText: {
+        fontSize: 20,
+        textAlign: 'center',
+        margin: 10
+    }
+});
diff --git a/src/screens/SymptomViewScreen.js b/src/screens/SymptomViewScreen.js
index 7995c4e9b..0b0bc2d39 100644
--- a/src/screens/SymptomViewScreen.js
+++ b/src/screens/SymptomViewScreen.js
@@ -11,8 +11,7 @@ import SymptomIconButton from '../components/SymptomTracker/SymptomIconButton';
 
 export default class SymptomViewScreen extends React.Component {
     static navigationOptions = ({navigation}) => ({
-        title: LanguageManager.getInstance().getText("VIEW_SYMPTOM"),
-        headerRight: <HeaderMenuButton onHeaderMenuSelected={(index) => navigation.state.params.onHeaderMenuSelected(index)}/>
+        title: LanguageManager.getInstance().getText("VIEW_SYMPTOM")
     })
 
     state = {
diff --git a/web-build/register-service-worker.js b/web-build/register-service-worker.js
new file mode 100644
index 000000000..94ece4f7b
--- /dev/null
+++ b/web-build/register-service-worker.js
@@ -0,0 +1,14 @@
+/* eslint-env browser */
+
+if ('serviceWorker' in navigator) {
+  window.addEventListener('load', function () {
+    navigator.serviceWorker
+      .register('/expo-service-worker.js', { scope: '/' })
+      .then(function (info) {
+        // console.info('Registered service-worker', info);
+      })
+      .catch(function (error) {
+        console.info('Failed to register service-worker', error);
+      });
+  });
+}