diff --git a/package-lock.json b/package-lock.json
index 7074015c..9bcaa03b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -736,6 +736,14 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@expo/vector-icons": {
+      "version": "github:expo/vector-icons#d0fb774a001b047d223cfa5e9537220b20591efd",
+      "from": "github:expo/vector-icons#d0fb774a001b047d223cfa5e9537220b20591efd",
+      "requires": {
+        "lodash": "^4.17.4",
+        "react-native-vector-icons": "6.0.0"
+      }
+    },
     "@expo/websql": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@expo/websql/-/websql-1.0.1.tgz",
@@ -2521,11 +2529,6 @@
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
-    "emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
-    },
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
@@ -2722,20 +2725,6 @@
         "serialize-error": "^2.1.0",
         "uuid-js": "^0.7.5",
         "whatwg-fetch": "^2.0.4"
-      },
-      "dependencies": {
-        "@expo/vector-icons": {
-          "version": "github:expo/vector-icons#d0fb774a001b047d223cfa5e9537220b20591efd",
-          "from": "github:expo/vector-icons#expo-font-fix",
-          "requires": {
-            "lodash": "^4.17.4",
-            "react-native-vector-icons": "6.0.0"
-          }
-        },
-        "react-native-maps": {
-          "version": "github:expo/react-native-maps#e6f98ff7272e5d0a7fe974a41f28593af2d77bb2",
-          "from": "github:expo/react-native-maps#v0.22.1-exp.0"
-        }
       }
     },
     "expo-ads-admob": {
@@ -4406,15 +4395,20 @@
       }
     },
     "loader-utils": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
       "requires": {
         "big.js": "^5.2.2",
-        "emojis-list": "^2.0.0",
+        "emojis-list": "^3.0.0",
         "json5": "^1.0.1"
       },
       "dependencies": {
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
+        },
         "json5": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
@@ -5826,6 +5820,10 @@
         "prop-types": "^15.5.10"
       }
     },
+    "react-native-maps": {
+      "version": "github:expo/react-native-maps#e6f98ff7272e5d0a7fe974a41f28593af2d77bb2",
+      "from": "github:expo/react-native-maps#e6f98ff7272e5d0a7fe974a41f28593af2d77bb2"
+    },
     "react-native-reanimated": {
       "version": "1.0.0-alpha.11",
       "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-1.0.0-alpha.11.tgz",
@@ -7469,7 +7467,7 @@
     "yargs": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
-      "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
+      "integrity": "sha512-3RiZrpLpjrzIAKgGdPktBcMP/eG5bDFlkI+PHle1qwzyVXyDQL+pD/eZaMoOOO0Y7LLBfjpucObuUm/icvbpKQ==",
       "requires": {
         "camelcase": "^4.1.0",
         "cliui": "^3.2.0",