Finish package data format rework, close #3, add extra item icons/types (#2)

5 years ago · bd588b09ba
parent e6b561f944
commit bd588b09ba
29 changed files with 2391 additions and 575 deletions
--- a/license-credits.md
+++ b/license-credits.md
--- a/www/assets/images/box-alert.png
+++ b/www/assets/images/box-alert.png
--- a/www/assets/images/box-alert.svg
+++ b/www/assets/images/box-alert.svg
@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   focusable="false"
-   data-prefix="fas"
-   data-icon="box-alt"
-   class="svg-inline--fa fa-box-alt fa-w-14"
-   role="img"
-   viewBox="0 0 448 512"
-   version="1.1"
-   id="svg916"
-   sodipodi:docname="box-alert.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   inkscape:export-filename="/home/skylar/Documents/Projects/Sources/PackageHelper/www/assets/images/box-alert.png"
-   inkscape:export-xdpi="10.687501"
-   inkscape:export-ydpi="10.687501">
-  <metadata
-     id="metadata922">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs920" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1013"
-     id="namedview918"
-     showgrid="false"
-     inkscape:zoom="1.0413252"
-     inkscape:cx="235.33213"
-     inkscape:cy="193.55813"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg916" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#ff9800;stroke-width:0.875"
-     d="M 445.8125,193.525 401.5375,60.699994 C 395.85001,43.549997 379.8375,31.999996 361.725,31.999996 H 238 V 200 h 208.8625 c -0.35,-2.1875 -0.35,-4.375 -1.05,-6.475 z M 210,31.999996 H 86.275001 C 68.1625,31.999996 52.15,43.549997 46.4625,60.699994 L 2.1874999,193.525 C 1.4875,195.625 1.4875,197.8125 1.1375,200 H 210 Z M 2.0000001e-7,228 V 438 C 2.0000001e-7,461.1875 18.8125,480 42,480 H 406.00001 C 429.1875,480 448,461.1875 448,438 V 228 Z"
-     id="path2" />
-  <path
-     sodipodi:type="star"
-     style="opacity:1;fill:#fff9c4;fill-opacity:1;stroke:#fff9c4;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="path949"
-     sodipodi:sides="3"
-     sodipodi:cx="224"
-     sodipodi:cy="382.43686"
-     sodipodi:r1="120.92724"
-     sodipodi:r2="60.463619"
-     sodipodi:arg1="0.52359878"
-     sodipodi:arg2="1.5707963"
-     inkscape:flatsided="true"
-     inkscape:rounded="0"
-     inkscape:randomized="0"
-     d="m 328.72606,442.90048 -209.45212,0 L 224,261.50962 Z"
-     inkscape:transform-center-y="-30.231809" />
-</svg>
--- a/www/assets/images/box-alt-solid.png
+++ b/www/assets/images/box-alt-solid.png
--- a/www/assets/images/box-alt-solid.svg
+++ b/www/assets/images/box-alt-solid.svg
@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="box-alt" class="svg-inline--fa fa-box-alt fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M446.7 160c.4-.5.5-.7.9-1.2L391.3 53.9C386.9 40.8 374.7 32 360.9 32H256l32 128h158.7zM160 160l32-128H87.1c-13.8 0-26 8.8-30.4 21.9L.4 158.8c.4.5.5.7.9 1.2H160zm128 32v80c0 8.8-7.2 16-16 16h-96c-8.8 0-16-7.2-16-16v-80H0v256c0 17.7 14.3 32 32 32h384c17.7 0 32-14.3 32-32V192H288z"></path></svg>
--- a/www/assets/images/box-check.png
+++ b/www/assets/images/box-check.png
--- a/www/assets/images/box.png
+++ b/www/assets/images/box.png
--- a/www/assets/images/box.svg
+++ b/www/assets/images/box.svg
@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   aria-hidden="true"
+   focusable="false"
+   data-prefix="fas"
+   data-icon="box"
+   class="svg-inline--fa fa-box fa-w-16"
+   role="img"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="box-solid.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   inkscape:export-filename="/home/skylar/Documents/Projects/Sources/PackageHelper/www/assets/images/box-solid.png"
+   inkscape:export-xdpi="9.3800001"
+   inkscape:export-ydpi="9.3800001">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1013"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.4609375"
+     inkscape:cx="-52.067797"
+     inkscape:cy="256"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M 504.64368,185.96782 455.01303,37.07586 C 448.63755,17.851339 430.68812,4.9042123 410.38467,4.9042123 H 271.69349 V 193.22605 h 234.1272 c -0.39234,-2.4521 -0.39234,-4.90421 -1.17701,-7.25823 z M 240.30651,4.9042123 H 101.61532 c -20.303445,0 -38.25287,12.9471267 -44.628349,32.1716477 L 7.3563195,185.96782 c -0.7846743,2.35402 -0.7846743,4.80613 -1.1770115,7.25823 H 240.30651 Z M 4.9042123,224.61303 v 235.4023 c 0,25.99233 21.0881227,47.08046 47.0804597,47.08046 H 460.01533 c 25.99233,0 47.08046,-21.08813 47.08046,-47.08046 v -235.4023 z"
+     id="path2"
+     style="fill:currentColor;stroke:#ffffff;stroke-width:9.80842876;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" />
+</svg>
--- a/www/assets/images/boxes.png
+++ b/www/assets/images/boxes.png
--- a/www/assets/images/boxes.svg
+++ b/www/assets/images/boxes.svg
@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   aria-hidden="true"
+   focusable="false"
+   data-prefix="fas"
+   data-icon="boxes"
+   class="svg-inline--fa fa-boxes fa-w-18"
+   role="img"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="boxes.svg"
+   width="512"
+   height="512"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   inkscape:export-filename="/home/skylar/Documents/Projects/Sources/PackageHelper/www/assets/images/boxes.png"
+   inkscape:export-xdpi="9.3800001"
+   inkscape:export-ydpi="9.3800001">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1013"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.4609375"
+     inkscape:cx="-20.067797"
+     inkscape:cy="256"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="m 493.65188,283.95905 h -69.89761 v 83.87713 l -27.95905,-18.61024 -27.95904,18.61024 v -83.87713 h -69.89761 c -7.68874,0 -13.97953,6.29078 -13.97953,13.97952 v 167.75427 c 0,7.68873 6.29079,13.97952 13.97953,13.97952 h 195.71331 c 7.68873,0 13.97952,-6.29079 13.97952,-13.97952 V 297.93857 c 0,-7.68874 -6.29079,-13.97952 -13.97952,-13.97952 z M 158.14334,228.04096 h 195.71332 c 7.68873,0 13.97952,-6.29078 13.97952,-13.97952 V 46.307167 c 0,-7.688738 -6.29079,-13.979523 -13.97952,-13.979523 H 283.95904 V 116.20478 L 256,97.594536 228.04096,116.20478 V 32.327644 h -69.89762 c -7.68873,0 -13.97952,6.290785 -13.97952,13.979523 V 214.06144 c 0,7.68874 6.29079,13.97952 13.97952,13.97952 z m 55.91809,55.91809 h -69.89761 v 83.87713 L 116.20478,349.22594 88.245734,367.83618 V 283.95905 H 18.348123 c -7.688738,0 -13.9795227,6.29078 -13.9795227,13.97952 v 167.75427 c 0,7.68873 6.2907847,13.97952 13.9795227,13.97952 H 214.06143 c 7.68874,0 13.97953,-6.29079 13.97953,-13.97952 V 297.93857 c 0,-7.68874 -6.29079,-13.97952 -13.97953,-13.97952 z"
+     id="path2"
+     style="fill:currentColor;stroke:#ffffff;stroke-width:8.73720169;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" />
+</svg>
--- a/www/assets/images/check.png
+++ b/www/assets/images/check.png
--- a/www/assets/images/check.svg
+++ b/www/assets/images/check.svg
@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   aria-hidden="true"
+   focusable="false"
+   data-prefix="fas"
+   data-icon="check-circle"
+   class="svg-inline--fa fa-check-circle fa-w-16"
+   role="img"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="check.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   inkscape:export-filename="/home/skylar/Documents/Projects/Sources/PackageHelper/www/assets/images/check.png"
+   inkscape:export-xdpi="9.3800001"
+   inkscape:export-ydpi="9.3800001">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="991"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.4609375"
+     inkscape:cx="-52.067797"
+     inkscape:cy="256"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="m 507.00001,256 c 0,138.62386 -112.37614,251.00001 -251,251.00001 C 117.37615,507.00001 4.9999944,394.62386 4.9999944,256 4.9999944,117.37614 117.37615,4.99999 256.00001,4.99999 c 138.62386,0 251,112.37615 251,251.00001 z M 226.967,388.90248 413.19281,202.67666 c 6.32358,-6.32357 6.32358,-16.57712 0,-22.90071 l -22.90072,-22.90071 c -6.32357,-6.32459 -16.57712,-6.32459 -22.90172,0 L 215.51613,308.74846 144.60964,237.84197 c -6.32357,-6.32358 -16.57712,-6.32358 -22.90172,0 l -22.900724,22.90072 c -6.323577,6.32357 -6.323577,16.57713 0,22.90071 L 204.06527,388.90147 c 6.32459,6.32459 16.57713,6.32459 22.90173,10e-4 z"
+     id="path2"
+     style="fill:#4caf50;stroke:#ffffff;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" />
+</svg>
--- a/www/assets/images/envelope.png
+++ b/www/assets/images/envelope.png
--- a/www/assets/images/envelope.svg
+++ b/www/assets/images/envelope.svg
@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   aria-hidden="true"
+   focusable="false"
+   data-prefix="fas"
+   data-icon="envelope"
+   class="svg-inline--fa fa-envelope fa-w-16"
+   role="img"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="envelope.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   inkscape:export-filename="/home/skylar/Documents/Projects/Sources/PackageHelper/www/assets/images/envelope.png"
+   inkscape:export-xdpi="9.3800001"
+   inkscape:export-ydpi="9.3800001">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1013"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.4609375"
+     inkscape:cx="-52.067797"
+     inkscape:cy="256"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="m 497.58161,192.04909 c 3.82529,-3.04058 9.51418,-0.19576 9.51418,4.60991 v 200.58242 c 0,25.99234 -21.08812,47.08041 -47.08046,47.08041 H 51.984673 c -25.992337,0 -47.0804607,-21.08807 -47.0804607,-47.08041 V 196.75708 c 0,-4.90416 5.5908047,-7.65048 9.5141767,-4.60991 21.970881,17.06667 51.101916,38.74324 151.147891,111.42375 20.69579,15.10501 55.6138,46.88424 90.43372,46.68808 35.01609,0.29415 70.62069,-32.17157 90.5318,-46.68808 100.04598,-72.68051 129.07893,-94.45516 151.04981,-111.52183 z M 256,318.77401 c 22.75556,0.39253 55.51571,-28.64068 71.99387,-40.60692 130.15786,-94.45517 140.06437,-102.69425 170.07817,-126.23451 5.68888,-4.41374 9.02375,-11.27966 9.02375,-18.53791 v -18.636 c 0,-25.992326 -21.08812,-47.080502 -47.08046,-47.080502 H 51.984673 c -25.992337,0 -47.0804607,21.088176 -47.0804607,47.080502 v 18.636 c 0,7.25825 3.3348668,14.02609 9.0237547,18.53791 30.013794,23.44218 39.920307,31.77934 170.078173,126.23451 16.47815,11.96624 49.2383,40.99925 71.99386,40.60692 z"
+     id="path2"
+     style="fill:currentColor;stroke:#ffffff;stroke-width:9.80842876;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" />
+</svg>
--- a/www/assets/images/envelopes.png
+++ b/www/assets/images/envelopes.png
--- a/www/assets/images/envelopes.svg
+++ b/www/assets/images/envelopes.svg
@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   aria-hidden="true"
+   focusable="false"
+   data-prefix="fas"
+   data-icon="envelope"
+   class="svg-inline--fa fa-envelope fa-w-16"
+   role="img"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="envelopes.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   inkscape:export-filename="/home/skylar/Documents/Projects/Sources/PackageHelper/www/assets/images/envelopes.png"
+   inkscape:export-xdpi="9.3800001"
+   inkscape:export-ydpi="9.3800001">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1013"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.921875"
+     inkscape:cx="83.470086"
+     inkscape:cy="133.23159"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <g
+     id="g887"
+     transform="matrix(1.2841353,0,0,1.2922221,-83.750814,-46.305296)"
+     style="stroke-width:0.77629364">
+    <g
+       transform="translate(-40.780375,-86.057789)"
+       id="g867"
+       style="stroke-width:0.77629364">
+      <rect
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:7.76293612;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect863"
+         width="300"
+         height="150.30811"
+         x="106"
+         y="180.84595" />
+      <path
+         d="m 395.598,219.21834 c 2.21045,-1.7488 5.49778,-0.11259 5.49778,2.65141 v 115.3659 c 0,14.94962 -12.18578,27.07852 -27.20546,27.07852 H 138.10968 c -15.01968,0 -27.20546,-12.1289 -27.20546,-27.07852 V 221.92616 c 0,-2.82065 3.23064,-4.4002 5.49777,-2.65141 12.69588,9.81597 29.52925,22.28335 87.34085,64.08588 11.95907,8.68772 32.13646,26.96569 52.25715,26.85287 20.23407,0.16918 40.80819,-18.50363 52.31384,-26.85287 57.8116,-41.80253 74.5883,-54.32632 87.28417,-64.14229 z m -139.59801,72.88642 c 13.14931,0.22577 32.07977,-16.47282 41.60169,-23.35526 75.21176,-54.32633 80.93624,-59.06507 98.27972,-72.60436 3.28732,-2.53858 5.21438,-6.48754 5.21438,-10.66216 V 174.7644 c 0,-14.94961 -12.18578,-27.07857 -27.20546,-27.07857 H 138.10968 c -15.01968,0 -27.20546,12.12897 -27.20546,27.07857 v 10.71858 c 0,4.17462 1.92705,8.06717 5.21437,10.66216 17.34349,13.48288 23.06797,18.27803 98.27973,72.60436 9.5219,6.88244 28.45237,23.58091 41.60167,23.35526 z"
+         id="path2"
+         style="fill:currentColor;stroke:#ffffff;stroke-width:7.61422062;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g879"
+       transform="translate(57.931492,41.942212)"
+       style="stroke-width:0.77629364">
+      <rect
+         y="180.84595"
+         x="106"
+         height="150.30811"
+         width="300"
+         id="rect875"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:7.76293612;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:currentColor;stroke:#ffffff;stroke-width:7.61422062;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path877"
+         d="m 395.598,219.21834 c 2.21045,-1.7488 5.49778,-0.11259 5.49778,2.65141 v 115.3659 c 0,14.94962 -12.18578,27.07852 -27.20546,27.07852 H 138.10968 c -15.01968,0 -27.20546,-12.1289 -27.20546,-27.07852 V 221.92616 c 0,-2.82065 3.23064,-4.4002 5.49777,-2.65141 12.69588,9.81597 29.52925,22.28335 87.34085,64.08588 11.95907,8.68772 32.13646,26.96569 52.25715,26.85287 20.23407,0.16918 40.80819,-18.50363 52.31384,-26.85287 57.8116,-41.80253 74.5883,-54.32632 87.28417,-64.14229 z m -139.59801,72.88642 c 13.14931,0.22577 32.07977,-16.47282 41.60169,-23.35526 75.21176,-54.32633 80.93624,-59.06507 98.27972,-72.60436 3.28732,-2.53858 5.21438,-6.48754 5.21438,-10.66216 V 174.7644 c 0,-14.94961 -12.18578,-27.07857 -27.20546,-27.07857 H 138.10968 c -15.01968,0 -27.20546,12.12897 -27.20546,27.07857 v 10.71858 c 0,4.17462 1.92705,8.06717 5.21437,10.66216 17.34349,13.48288 23.06797,18.27803 98.27973,72.60436 9.5219,6.88244 28.45237,23.58091 41.60167,23.35526 z" />
+    </g>
+  </g>
+</svg>
--- a/www/assets/images/express.png
+++ b/www/assets/images/express.png
--- a/www/assets/images/express.svg
+++ b/www/assets/images/express.svg
@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   aria-hidden="true"
+   focusable="false"
+   data-prefix="fas"
+   data-icon="shipping-fast"
+   class="svg-inline--fa fa-shipping-fast fa-w-20"
+   role="img"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="express.svg"
+   width="512"
+   height="512"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   inkscape:export-filename="/home/skylar/Documents/Projects/Sources/PackageHelper/www/assets/images/express.png"
+   inkscape:export-xdpi="9.3800001"
+   inkscape:export-ydpi="9.3800001">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8">
+    <linearGradient
+       id="linearGradient827"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop825" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1013"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.4609375"
+     inkscape:cx="11.932203"
+     inkscape:cy="256"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="m 499.2,332.8 h -12.8 v -86.48 c 0,-10.16 -4.08,-19.92 -11.28,-27.12 L 395.2,139.28 C 388,132.08 378.24,128 368.08,128 H 332.8 V 89.6 c 0,-21.2 -17.2,-38.4 -38.4,-38.4 H 89.600002 c -21.2,0 -38.4,17.2 -38.4,38.4 V 128 H 6.3999985 c -3.52,0 -6.4,2.88 -6.4,6.4 v 12.8 c 0,3.52 2.88,6.4 6.4,6.4 H 224 c 3.52,0 6.4,2.88 6.4,6.4 v 12.8 c 0,3.52 -2.88,6.4 -6.4,6.4 H 31.999999 c -3.52,0 -6.4,2.88 -6.4,6.4 v 12.8 c 0,3.52 2.88,6.4 6.4,6.4 H 198.4 c 3.52,0 6.4,2.88 6.4,6.4 V 224 c 0,3.52 -2.88,6.4 -6.4,6.4 H 6.3999985 c -3.52,0 -6.4,2.88 -6.4,6.4 v 12.8 c 0,3.52 2.88,6.4 6.4,6.4 H 172.8 c 3.52,0 6.4,2.88 6.4,6.4 v 12.8 c 0,3.52 -2.88,6.4 -6.4,6.4 H 51.200002 V 384 c 0,42.4 34.4,76.8 76.799998,76.8 42.4,0 76.8,-34.4 76.8,-76.8 h 102.4 c 0,42.4 34.4,76.8 76.8,76.8 42.4,0 76.8,-34.4 76.8,-76.8 h 38.4 c 7.04,0 12.8,-5.76 12.8,-12.8 v -25.6 c 0,-7.04 -5.76,-12.8 -12.8,-12.8 z M 128,422.4 c -21.2,0 -38.399998,-17.2 -38.399998,-38.4 0,-21.2 17.199998,-38.4 38.399998,-38.4 21.2,0 38.4,17.2 38.4,38.4 0,21.2 -17.2,38.4 -38.4,38.4 z m 256,0 c -21.2,0 -38.4,-17.2 -38.4,-38.4 0,-21.2 17.2,-38.4 38.4,-38.4 21.2,0 38.4,17.2 38.4,38.4 0,21.2 -17.2,38.4 -38.4,38.4 z M 448,256 H 332.8 v -89.6 h 35.28 L 448,246.32 Z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:currentColor;stroke:#ffffff;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
--- a/www/assets/images/multiple-items.png
+++ b/www/assets/images/multiple-items.png
--- a/www/assets/images/multiple-items.svg
+++ b/www/assets/images/multiple-items.svg
@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   aria-hidden="true"
+   focusable="false"
+   data-prefix="fas"
+   data-icon="mail-bulk"
+   class="svg-inline--fa fa-mail-bulk fa-w-18"
+   role="img"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="multiple-items.svg"
+   width="512"
+   height="512"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   inkscape:export-filename="/home/skylar/Documents/Projects/Sources/PackageHelper/www/assets/images/multiple-items.png"
+   inkscape:export-xdpi="9.3800001"
+   inkscape:export-ydpi="9.3800001">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#060606"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="991"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.4609375"
+     inkscape:cx="-20.067797"
+     inkscape:cy="256"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="m 144.70646,422.94033 c -22.25872,0 -44.51743,-19.47637 -55.64678,-27.82338 C 33.412906,356.1642 16.718874,342.25252 5.5895199,333.90549 v 116.85823 c 0,15.36372 12.4596611,27.82338 27.8233861,27.82338 H 255.99999 c 15.36374,0 27.82339,-12.45966 27.82339,-27.82338 V 333.90549 c -11.12936,8.34703 -27.82339,22.25871 -83.47016,61.21146 -11.12935,8.34701 -33.38805,27.82338 -55.64676,27.82338 z M 255.99999,256 H 33.412906 C 18.049181,256 5.5895199,268.45967 5.5895199,283.8234 v 13.91169 c 22.2587091,16.69403 19.4763701,16.69403 100.1641901,75.12315 8.34702,5.56467 25.04104,22.25871 38.95275,22.25871 13.91169,0 30.60572,-16.69404 38.95273,-19.47639 80.68782,-58.42911 77.90548,-58.42911 100.16419,-75.12313 V 283.8234 C 283.82338,268.45967 271.36373,256 255.99999,256 Z M 478.5871,172.52984 H 200.35322 c -15.36372,0 -27.82338,12.45966 -27.82338,27.8234 v 27.82339 h 83.47015 c 28.87547,0 52.68186,22.1022 55.39463,50.27337 l 0.25216,-0.19129 V 395.11695 H 478.5871 c 15.36372,0 27.82338,-12.45968 27.82338,-27.8234 V 200.35324 c 0,-15.36374 -12.45966,-27.8234 -27.82338,-27.8234 z M 450.76371,283.8234 h -55.64678 v -55.64677 h 55.64678 z M 144.70646,200.35324 c 0,-30.68398 24.96279,-55.64678 55.64676,-55.64678 H 395.11693 V 61.236302 c 0,-15.363722 -12.45965,-27.823398 -27.82339,-27.823398 H 89.05968 c -15.363727,0 -27.823387,12.459676 -27.823387,27.823398 V 228.17663 h 83.470167 z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="fill:currentColor;stroke:#fffafa;stroke-width:11.179039;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
--- a/www/assets/images/usps-brands.svg
+++ b/www/assets/images/usps-brands.svg
@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="usps" class="svg-inline--fa fa-usps fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M460.3 241.7c25.8-41.3 15.2-48.8-11.7-48.8h-27c-.1 0-1.5-1.4-10.9 8-11.2 5.6-37.9 6.3-37.9 8.7 0 4.5 70.3-3.1 88.1 0 9.5 1.5-1.5 20.4-4.4 32-.5 4.5 2.4 2.3 3.8.1zm-112.1 22.6c64-21.3 97.3-23.9 102-26.2 4.4-2.9-4.4-6.6-26.2-5.8-51.7 2.2-137.6 37.1-172.6 53.9l-30.7-93.3h196.6c-2.7-28.2-152.9-22.6-337.9-22.6L27 415.8c196.4-97.3 258.9-130.3 321.2-151.5zM94.7 96c253.3 53.7 330 65.7 332.1 85.2 36.4 0 45.9 0 52.4 6.6 21.1 19.7-14.6 67.7-14.6 67.7-4.4 2.9-406.4 160.2-406.4 160.2h423.1L549 96z"></path></svg>
--- a/www/assets/js/list.js
+++ b/www/assets/js/list.js
@ -111,12 +111,12 @@ function loadPackageList(sortType) {
    for (var i = 0; i < sortedPackages.length; i++) {
        for (var j = 0; j < sortedPackages[i].value.items.length; j++) {
            var item = sortedPackages[i].value.items[j];
-            var icon = "fas fa-box-open";
+            var icon = getIconForType(item.type);
            var classes = "";
            var delivered = false;
            if (item.delivered) {
                delivered = true;
-                icon = "fas fa-check";
+                icon = "far fa-check-circle";
                classes = "text-color-green";
            } else if (typeof sortedPackages[i].value.distance != 'undefined' && sortedPackages[i].value.distance * 1 < localStorage.getItem("alertradius") * 1) {
                classes = "text-color-deeporange";
@ -124,7 +124,7 @@ function loadPackageList(sortType) {
            $("#addresslist").append(
                    '<li class="swipeout package-list-item" data-packageid="' + item.id + '" data-coordid=' + sortedPackages[i].value.id + '>'
                    + '<div class="item-content swipeout-content ' + classes + '" data-packageid="' + item.id + '" data-latitude="' + sortedPackages[i].value.coords[0] + '" data-longitude="' + sortedPackages[i].value.coords[1] + '">'
-                    + '  <div class="item-media">'
+                    + '  <div class="item-media ' + classes + '">'
                    + '    <i class="icon ' + icon + '"></i>'
                    + '  </div>'
                    + '  <div class="item-inner">'
--- a/www/assets/js/map.js
+++ b/www/assets/js/map.js
@ -33,25 +33,16 @@ function reloadMap() {
    }
 }

-/**
- * Make the toggle button on the popup sheet do things
- */
-$("#app").on("click", "#package-info-sheet .package-info-toggle-status", function () {
-    var pid = $(this).data("id");
-    markDelivered(pid);
-    map.updatePackageLayer(packages);
-    for (var i = 0; i < packages.length; i++) {
-        if (packages[i].id == $(this).data("coordid")) {
-            openPackageInfoSheet(packages[i], true);
-            return;
-        }
-    }
-});
-
 $("#app").on("click", "#package-info-sheet #package-info-get-directions", function () {
    window.open($(this).attr("href"), "_system");
 });

+$("#app").on("click", "#package-info-sheet #package-info-sheet-inner .list ul li .item-content", function () {
+    markDelivered($(this).data("id"));
+    map.updatePackageLayer(packages);
+    openPackageInfoSheet($(this).data("coordid"), true);
+});
+
 function openPackageInfoSheet(coordid, refreshOnly) {
    if (typeof refreshOnly == "undefined") {
        refreshOnly = false;
@ -62,23 +53,26 @@ function openPackageInfoSheet(coordid, refreshOnly) {
            package = packages[i];

            $("#package-info-get-directions").attr("href", "geo:" + package.coords[0] + "," + package.coords[1]);
-            $("#package-info-sheet-inner").html("");
+            $("#package-info-sheet-inner .list ul").html("");

            for (var i = 0; i < package.items.length; i++) {
-                $("#package-info-sheet-inner").append(''
-                        + '<div class="block margin-top-half">'
-                        + '  <div>'
-                        + '    <span class="package-info-delivery-status">'
-                        + '      ' + +(package.items[i].delivered ? '<span class="text-color-green"><i class="fas fa-check-circle"></i> Delivered</span>' : '<i class="fas fa-circle"></i> Not delivered')
-                        + '    </span>'
+                var classes = "";
+                var icon = getIconForType(package.items[i].type);
+                var statusicon = "far fa-circle";
+                if (package.items[i].delivered) {
+                    classes = "text-color-green";
+                    statusicon = "far fa-check-circle";
+                }
+                $("#package-info-sheet-inner .list ul").append(''
+                        + '<li>'
+                        + '    <div class="item-content ' + classes + '" data-id="' + package.items[i].id + '" data-coordid="' + package.id + '">'
+                        + '        <div class="item-media"><i class="' + statusicon + '"></i></div>'
+                        + '        <div class="item-inner">'
+                        + '            <div class="item-title">' + package.items[i].address + '</div>'
+                        + '            <div class="item-after"><i class="' + icon + '"></i></div>'
                        + '        </div>'
-                        + '  <h3>'
-                        + '    <span class="package-info-address">' + package.items[i].address + '</span>'
-                        + '  </h3>'
-                        + '  <div class="button button-fill margin-top" class="package-info-toggle-status" data-id="' + package.items[i].id + '" data-coordid=' + package.id + '>'
-                        + '    ' + (package.items[i].delivered ? "Undeliver" : "Deliver")
                        + '    </div>'
-                        + '</div>');
+                        + '</li>');
            }

            if (!refreshOnly) {
--- a/www/assets/js/map_leaflet.js
+++ b/www/assets/js/map_leaflet.js
@ -55,13 +55,14 @@ function leafletMap() {
    map.updatePackageLayer = function (data) {
        map.packagelayer.clearLayers();

+        console.log(data);
+
        for (var i = 0; i < data.length; i++) {
-            var iconName = "box";
-            if (getUndeliveredCount(data[i]) == 0) {
-                iconName = "box-check";
-            } else if (data[i].distance * 1 < localStorage.getItem("alertradius") * 1) {
-                iconName = "box-alert";
-            }
+            // JavaScript variable scope and anonymous functions are dumb
+            // This is necessary, otherwise all the on(click)s will fire for the last iteration
+            // of the loop, or something like that
+            (function (datai) {
+                var iconName = getMapIconForItems(datai.items);

                var icon = L.icon({
                    iconUrl: "assets/images/" + iconName + ".png",
@ -71,17 +72,18 @@ function leafletMap() {

                var marker = L.marker(
                        [
-                        data[i].coords[0],
-                        data[i].coords[1]
+                            datai.coords[0],
+                            datai.coords[1]
                        ],
                        {
                            icon: icon
                        })
                        .on("click", function () {
-                        openPackageInfoSheet(data[i].id);
+                            openPackageInfoSheet(datai.id)
                        });

                map.packagelayer.addLayer(marker);
+            })(data[i]);
        }
    }

--- a/www/assets/js/packages.js
+++ b/www/assets/js/packages.js
@ -25,14 +25,65 @@ function getUndeliveredCount(address) {
    return undelivered;
 }

-function addPackage(address, latitude, longitude) {
+function getIconForType(packagetype) {
+    switch (packagetype) {
+        case "package":
+            return "fas fa-box";
+        case "letter":
+            return "fas fa-envelope";
+        case "express":
+            return "fas fa-shipping-fast";
+        default:
+            return "fas fa-box";
+    }
+}
+
+function getMapIconForItems(items) {
+    var types = {
+        package: 0,
+        letter: 0,
+        express: 0
+    };
+    var deliveredcount = 0;
+    var type = "package";
+    for (var i = 0; i < items.length; i++) {
+        types[items[i].type]++;
+        if (items[i].delivered) {
+            deliveredcount++;
+        }
+    }
+    if (deliveredcount == items.length) {
+        return "check";
+    }
+    if (types.letter == 0 && types.express == 0) {
+        if (types.package > 1) {
+            return "boxes";
+        }
+        return "box";
+    }
+    if (types.package == 0 && types.express == 0) {
+        if (types.letter > 1) {
+            return "envelopes";
+        }
+        return "envelope";
+    }
+    if (types.package == 0 && types.letter == 0) {
+        return "express";
+    }
+    return "multiple-items";
+}
+
+function addPackage(address, latitude, longitude, type) {
    var added = false;
+    if (typeof type == 'undefined') {
+        type = "package";
+    }
    for (var i = 0; i < packages.length; i++) {
        if (packages[i].coords[0] == latitude && packages[i].coords[1] == longitude && packages[i].address == address) {
            packages[i].items.push({
                address: address,
                delivered: false,
-                type: "package",
+                type: type,
                id: uuidv4()
            });
            added = true;
@ -51,7 +102,7 @@ function addPackage(address, latitude, longitude) {
                {
                    address: address,
                    delivered: false,
-                    type: "package",
+                    type: type,
                    id: uuidv4()
                }
            ]
@ -78,7 +129,7 @@ function markDelivered(id, delivered) {
        for (var j = 0; j < packages[i].items.length; j++) {
            if (packages[i].items[j].id == id) {
                if (typeof delivered == 'undefined') {
-                    if (typeof packages[id].delivered == "undefined" || packages[id].delivered == false) {
+                    if (packages[i].items[j].delivered == false) {
                        delivered = true;
                    } else {
                        delivered = false;
@ -140,6 +191,16 @@ function countRemainingPackages() {
    return undelivered;
 }

+function countPackages() {
+    var count = 0;
+    for (var i = 0; i < packages.length; i++) {
+        for (var j = 0; j < packages[i].items.length; j++) {
+            count++;
+        }
+    }
+    return count;
+}
+
 function addPackageByAddress(address, citystate) {
    $.getJSON(SETTINGS.geocodeapi, {
        address: address + " " + citystate
--- a/www/pages/credits.html
+++ b/www/pages/credits.html
--- a/www/pages/map.html
+++ b/www/pages/map.html
@ -38,18 +38,18 @@
                <div class="right"><a class="link sheet-close" href="#">Done</a></div>
            </div>
        </div>
-        <div class="sheet-modal-inner" id="package-info-sheet-inner">
-            <div class="block margin-top-half">
-                <div>
-                    <span id="package-info-delivery-status"></span>
-                </div>
-                <h3>
-                    <span id="package-info-address">...</span>
-                </h3>
-
-                <div class="button button-fill margin-top" id="package-info-toggle-status">
-                    Deliver
-                </div>
+        <div class="sheet-modal-inner" id="package-info-sheet-inner" style="overflow-y: scroll;">
+            <div class="list no-hairlines no-margin-top">
+                <ul>
+                    <li>
+                        <div class="item-content ' + classes + '" data-id="'+ package.items[i].id +'">
+                            <div class="item-media"><i class="' + icon +'"></i></div>
+                            <div class="item-inner">
+                                <div class="item-title">' + package.items[i].address + '</div>
+                            </div>
+                        </div>
+                    </li>
+                </ul>
            </div>
        </div>
    </div>
--- a/www/routes.js
+++ b/www/routes.js
@ -9,7 +9,7 @@ var routes = [
        path: '/home',
        name: 'home',
        async: function (routeTo, routeFrom, resolve, reject) {
-            var total = packages.length;
+            var total = countPackages();
            var undelivered = countRemainingPackages();
            var delivered = total - undelivered;
            var percent = (total > 0 ? (delivered / packages.length) : 1);
--- a/yarn.lock
+++ b/yarn.lock
@ -2,50 +2,38 @@
 # yarn lockfile v1


-abbrev@*, abbrev@1:
+abbrev@1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==

-android-versions@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/android-versions/-/android-versions-1.4.0.tgz#807ea2941d7e5780e6dd61c5d9b7b6f3c0706e09"
-  integrity sha512-GnomfYsBq+nZh3c3UH/4r9Jt6FuTxdhUJbeHIdYOH5xBhQ8I0ZzC2/RM5IFFIjrzuNWSHb8JWP1lPK0/a26jrg==
+android-versions@^1.3.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/android-versions/-/android-versions-1.5.0.tgz#7790bc74e0812aafd69fb1ad0cb4db4474a525d6"
+  integrity sha512-/GWUAqa2OJNlDF5VGSe3SR1QMHEPXxx54Ur56r0qQC0H9FlBr7kyBF2SgVEhzFCPbrW4UcYgVuWrq/2Ty3QvXg==
  dependencies:
    semver "^5.4.1"

-ansi@*, ansi@^0.3.1:
+ansi@^0.3.1:
  version "0.3.1"
  resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
  integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=

-balanced-match@*, balanced-match@^1.0.0:
+balanced-match@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=

-base64-js@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
-  integrity sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=
-
-big-integer@1.6.32:
-  version "1.6.32"
-  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.32.tgz#5867458b25ecd5bcb36b627c30bb501a13c07e89"
-  integrity sha512-ljKJdR3wk9thHfLj4DtrNiOSTxvGFaMjWrG4pW75juXC4j7+XuKJVFdg4kgFMYp85PVkO05dFMj2dk2xVsH4xw==
+base64-js@^1.2.3:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
+  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==

-big-integer@^1.6.44, big-integer@^1.6.7:
+big-integer@^1.6.7:
  version "1.6.44"
  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.44.tgz#4ee9ae5f5839fc11ade338fea216b4513454a539"
  integrity sha512-7MzElZPTyJ2fNvBkPxtFQ2fWIkVmuzw41+BZHSzpEq3ymB2MfeKp1+yXl/tS75xCx+WnyV+yb0kp+K1C3UNwmQ==

-bplist-parser@*:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.2.0.tgz#43a9d183e5bf9d545200ceac3e712f79ebbe8d0e"
-  integrity sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==
-  dependencies:
-    big-integer "^1.6.44"
-
 bplist-parser@^0.1.0:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"
@ -53,7 +41,7 @@ bplist-parser@^0.1.0:
  dependencies:
    big-integer "^1.6.7"

-brace-expansion@*, brace-expansion@^1.1.7:
+brace-expansion@^1.1.7:
  version "1.1.11"
  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
@ -61,48 +49,42 @@ brace-expansion@*, brace-expansion@^1.1.7:
    balanced-match "^1.0.0"
    concat-map "0.0.1"

-concat-map@*, concat-map@0.0.1:
+concat-map@0.0.1:
  version "0.0.1"
  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=

-cordova-android@^7.0.0:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/cordova-android/-/cordova-android-7.1.4.tgz#25261ad66cc64f42a30b70be005901fa30e2430e"
-  integrity sha512-Rtvu002I83uzfVyCsE6p2krFKVHt9TSAqZUATes+zH+o9cdxYGrLHY+PKCQo4SLCdSMdrkIHCDnQPTYTp/d7+g==
-  dependencies:
-    android-versions "1.4.0"
-    base64-js "1.2.0"
-    big-integer "1.6.32"
-    cordova-common "2.2.5"
-    elementtree "0.1.6"
-    glob "5.0.15"
-    nopt "3.0.1"
-    path-is-absolute "1.0.1"
-    plist "2.1.0"
-    properties-parser "0.2.3"
-    q "1.4.1"
-    sax "0.3.5"
-    semver "5.5.0"
-    shelljs "0.5.3"
-    xmlbuilder "8.2.2"
-
-cordova-common@2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/cordova-common/-/cordova-common-2.2.5.tgz#f93cef2ad494cfcbf56c46e3d612aaa9cb5fcc32"
-  integrity sha1-+TzvKtSUz8v1bEbj1hKqqctfzDI=
+cordova-android@~8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/cordova-android/-/cordova-android-8.0.0.tgz#1fbe05a914731df619522b9385d4d1b183c36bdb"
+  integrity sha512-Ipv8HbVJpxEyYFSFLTEOaLRp0yxBtJVNbgSuDEB4naa34FzQaRWSNiiMcPJnO+x3hRXNt7pcwa46hARNzhn7+w==
+  dependencies:
+    android-versions "^1.3.0"
+    cordova-common "^3.1.0"
+    elementtree "^0.1.7"
+    nopt "^4.0.1"
+    properties-parser "^0.3.1"
+    q "^1.4.1"
+    shelljs "^0.5.3"
+
+cordova-common@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cordova-common/-/cordova-common-3.2.0.tgz#9a5c9215f817d7a08fbd014bf963c544e1feb671"
+  integrity sha512-EvlQ6PirfR65hGDoQvsluW00uSS2MTVIRKQ3c1Xvsddx7D5T5JgF3fHWkGik/Y/8yNcpI0zI2NcJyie2z/ak2A==
  dependencies:
    ansi "^0.3.1"
    bplist-parser "^0.1.0"
-    cordova-registry-mapper "^1.1.8"
-    elementtree "0.1.6"
-    glob "^5.0.13"
+    cross-spawn "^6.0.5"
+    elementtree "0.1.7"
+    endent "^1.1.1"
+    fs-extra "^8.0.0"
+    glob "^7.1.2"
    minimatch "^3.0.0"
-    plist "^2.1.0"
+    plist "^3.0.1"
    q "^1.4.1"
-    shelljs "^0.5.3"
+    strip-bom "^3.0.0"
    underscore "^1.8.3"
-    unorm "^1.3.3"
+    which "^1.3.0"

 cordova-plugin-geolocation@~4.0.2:
  version "4.0.2"
@ -114,39 +96,150 @@ cordova-plugin-inappbrowser@~3.1.0:
  resolved "https://registry.yarnpkg.com/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-3.1.0.tgz#61520b8de3eb75b37842d2340f5d90a84a073747"
  integrity sha512-YqrZfYgbGTS20SFID0mrRxud312VH072QVlFonCAkPgtGg1Svy7lELOCNFd+KU7t4mVtZeTEjZPEeefvjaetwQ==

-"cordova-plugin-powermanagement-orig@git+https://source.netsyms.com/Mirrors/boltex_cordova-plugin-powermanagement.git":
+"cordova-plugin-powermanagement-netsyms@git+https://source.netsyms.com/Netsyms/cordova-plugin-powermanagement":
  version "1.1.0"
-  resolved "git+https://source.netsyms.com/Mirrors/boltex_cordova-plugin-powermanagement.git#dd5b6d7dcc01939df82f989a12bf4b9282ae1b10"
+  resolved "git+https://source.netsyms.com/Netsyms/cordova-plugin-powermanagement#1cca6de3d8153b369cef147d7e1689272d0944f3"

 cordova-plugin-whitelist@^1.3.4:
  version "1.3.4"
  resolved "https://registry.yarnpkg.com/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.4.tgz#31938545c7c3e7de35c20ab08c2c3afa06e8a3f9"
  integrity sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ==

-cordova-registry-mapper@*, cordova-registry-mapper@^1.1.8:
-  version "1.1.15"
-  resolved "https://registry.yarnpkg.com/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz#e244b9185b8175473bff6079324905115f83dc7c"
-  integrity sha1-4kS5GFuBdUc7/2B5MkkFEV+D3Hw=
+cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+dedent@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
+
+deep-equal@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
+
+define-properties@^1.1.2, define-properties@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+  dependencies:
+    object-keys "^1.0.12"
+
+defined@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
+
+elementtree@0.1.7, elementtree@^0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/elementtree/-/elementtree-0.1.7.tgz#9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"
+  integrity sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=
+  dependencies:
+    sax "1.1.4"
+
+endent@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/endent/-/endent-1.3.0.tgz#ea86b583d7b7caff5cbee5ad2c7c322eb1900c76"
+  integrity sha512-C8AryqPPwtydqcpO5AF6k9Bd1EpFkQtvsefJqS3y3n8TG13Jy63MascDxTOULZYqrUde+dK6BjNc6LIMr3iI2A==
+  dependencies:
+    dedent "^0.7.0"
+    fast-json-parse "^1.0.3"
+    objectorarray "^1.0.3"
+
+es-abstract@^1.5.0:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.14.2.tgz#7ce108fad83068c8783c3cdf62e504e084d8c497"
+  integrity sha512-DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg==
+  dependencies:
+    es-to-primitive "^1.2.0"
+    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"
+    object-keys "^1.1.1"
+    string.prototype.trimleft "^2.0.0"
+    string.prototype.trimright "^2.0.0"
+
+es-to-primitive@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
+  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
+fast-json-parse@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/fast-json-parse/-/fast-json-parse-1.0.3.tgz#43e5c61ee4efa9265633046b770fb682a7577c4d"
+  integrity sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==
+
+for-each@~0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
+  dependencies:
+    is-callable "^1.1.3"

-elementtree@0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/elementtree/-/elementtree-0.1.6.tgz#2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"
-  integrity sha1-KsTEbqMFFsjEy9teOsdBjlkt4gw=
+fs-extra@^8.0.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
  dependencies:
-    sax "0.3.5"
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"

-glob@5.0.15, glob@^5.0.13:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+function-bind@^1.0.2, function-bind@^1.1.1, function-bind@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+glob@^7.1.2, glob@~7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
  dependencies:
+    fs.realpath "^1.0.0"
    inflight "^1.0.4"
    inherits "2"
-    minimatch "2 || 3"
+    minimatch "^3.0.4"
    once "^1.3.0"
    path-is-absolute "^1.0.0"

-inflight@*, inflight@^1.0.4:
+graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
+  integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
+
+has-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
+
+has@^1.0.1, has@^1.0.3, has@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
+inflight@^1.0.4:
  version "1.0.6"
  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
@ -154,102 +247,278 @@ inflight@*, inflight@^1.0.4:
    once "^1.3.0"
    wrappy "1"

-inherits@*, inherits@2:
+inherits@2, inherits@~2.0.4:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==

-minimatch@*, "minimatch@2 || 3", minimatch@^3.0.0:
+is-callable@^1.1.3, is-callable@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
+
+is-date-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
+
+is-regex@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
+  dependencies:
+    has "^1.0.1"
+
+is-symbol@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
+  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
+  dependencies:
+    has-symbols "^1.0.0"
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+minimatch@^3.0.0, minimatch@^3.0.4:
  version "3.0.4"
  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
  dependencies:
    brace-expansion "^1.1.7"

-nopt@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.1.tgz#bce5c42446a3291f47622a370abbf158fbbacbfd"
-  integrity sha1-vOXEJEajKR9HYio3CrvxWPu6y/0=
+minimist@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
+nopt@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
  dependencies:
    abbrev "1"
+    osenv "^0.1.4"

-once@*, once@^1.3.0:
+object-inspect@^1.6.0, object-inspect@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
+  integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
+
+object-keys@^1.0.12, object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
+objectorarray@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/objectorarray/-/objectorarray-1.0.3.tgz#d2a2de9097c06a48d7d77264fd71406519e7c772"
+  integrity sha512-kPoflSYkAf/Onvjr4ZLaq37vDuOXjVzfwLCRuORRzYGdXkHa/vacPT0RgR+KmtkwOYFcxTMM62BRrZk8GGKHjw==
+  dependencies:
+    tape "^4.8.0"
+
+once@^1.3.0:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
  dependencies:
    wrappy "1"

-path-is-absolute@1.0.1, path-is-absolute@^1.0.0:
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+
+os-tmpdir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+
+osenv@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+path-is-absolute@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=

-plist@2.1.0, plist@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/plist/-/plist-2.1.0.tgz#57ccdb7a0821df21831217a3cad54e3e146a1025"
-  integrity sha1-V8zbeggh3yGDEhejytVOPhRqECU=
+path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+
+plist@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c"
+  integrity sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==
  dependencies:
-    base64-js "1.2.0"
-    xmlbuilder "8.2.2"
+    base64-js "^1.2.3"
+    xmlbuilder "^9.0.7"
    xmldom "0.1.x"

-properties-parser@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/properties-parser/-/properties-parser-0.2.3.tgz#f7591255f707abbff227c7b56b637dbb0373a10f"
-  integrity sha1-91kSVfcHq7/yJ8e1a2N9uwNzoQ8=
-
-q@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
-  integrity sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=
+properties-parser@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/properties-parser/-/properties-parser-0.3.1.tgz#1316e9539ffbfd93845e369b211022abd478771a"
+  integrity sha1-ExbpU5/7/ZOEXjabIRAiq9R4dxo=
+  dependencies:
+    string.prototype.codepointat "^0.2.0"

 q@^1.4.1:
  version "1.5.1"
  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=

-sax@0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-0.3.5.tgz#88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"
-  integrity sha1-iPz8H3PAyLvVt8d2ttPzUB7tBz0=
+resolve@~1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
+  integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==
+  dependencies:
+    path-parse "^1.0.6"
+
+resumer@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/resumer/-/resumer-0.0.0.tgz#f1e8f461e4064ba39e82af3cdc2a8c893d076759"
+  integrity sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=
+  dependencies:
+    through "~2.3.4"

-semver@5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
-  integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
+sax@1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.1.4.tgz#74b6d33c9ae1e001510f179a91168588f1aedaa9"
+  integrity sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk=

-semver@^5.4.1:
+semver@^5.4.1, semver@^5.5.0:
  version "5.7.1"
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==

-shelljs@0.5.3, shelljs@^0.5.3:
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
+shelljs@^0.5.3:
  version "0.5.3"
  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.5.3.tgz#c54982b996c76ef0c1e6b59fbdc5825f5b713113"
  integrity sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM=

-underscore@*, underscore@^1.8.3:
+string.prototype.codepointat@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz#004ad44c8afc727527b108cd462b4d971cd469bc"
+  integrity sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg==
+
+string.prototype.trim@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea"
+  integrity sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.5.0"
+    function-bind "^1.0.2"
+
+string.prototype.trimleft@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634"
+  integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==
+  dependencies:
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
+
+string.prototype.trimright@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58"
+  integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==
+  dependencies:
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
+tape@^4.8.0:
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/tape/-/tape-4.11.0.tgz#63d41accd95e45a23a874473051c57fdbc58edc1"
+  integrity sha512-yixvDMX7q7JIs/omJSzSZrqulOV51EC9dK8dM0TzImTIkHWfe2/kFyL5v+d9C+SrCMaICk59ujsqFAVidDqDaA==
+  dependencies:
+    deep-equal "~1.0.1"
+    defined "~1.0.0"
+    for-each "~0.3.3"
+    function-bind "~1.1.1"
+    glob "~7.1.4"
+    has "~1.0.3"
+    inherits "~2.0.4"
+    minimist "~1.2.0"
+    object-inspect "~1.6.0"
+    resolve "~1.11.1"
+    resumer "~0.0.0"
+    string.prototype.trim "~1.1.2"
+    through "~2.3.8"
+
+through@~2.3.4, through@~2.3.8:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+
+underscore@^1.8.3:
  version "1.9.1"
  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
  integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==

-unorm@*, unorm@^1.3.3:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.6.0.tgz#029b289661fba714f1a9af439eb51d9b16c205af"
-  integrity sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
+which@^1.2.9, which@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"

-wrappy@*, wrappy@1:
+wrappy@1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=

-xmlbuilder@8.2.2:
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773"
-  integrity sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=
+xmlbuilder@^9.0.7:
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=

-xmldom@*, xmldom@0.1.x:
+xmldom@0.1.x:
  version "0.1.27"
  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
  integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
				`@ -1 +0,0 @@`
				<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="box-alt" class="svg-inline--fa fa-box-alt fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M446.7 160c.4-.5.5-.7.9-1.2L391.3 53.9C386.9 40.8 374.7 32 360.9 32H256l32 128h158.7zM160 160l32-128H87.1c-13.8 0-26 8.8-30.4 21.9L.4 158.8c.4.5.5.7.9 1.2H160zm128 32v80c0 8.8-7.2 16-16 16h-96c-8.8 0-16-7.2-16-16v-80H0v256c0 17.7 14.3 32 32 32h384c17.7 0 32-14.3 32-32V192H288z"></path></svg>