diff --git a/app/Http/Controllers/FrontPageController.php b/app/Http/Controllers/FrontPageController.php
index 3bab8c56..dd8521c1 100644
--- a/app/Http/Controllers/FrontPageController.php
+++ b/app/Http/Controllers/FrontPageController.php
@@ -6,6 +6,7 @@ use App\Models\Like;
 use App\Models\Note;
 use App\Models\Article;
 use App\Models\Bookmark;
+use App\Services\ActivityStreamsService;
 
 class FrontPageController extends Controller
 {
@@ -14,6 +15,10 @@ class FrontPageController extends Controller
      */
     public function index()
     {
+        if (request()->wantsActivityStream()) {
+            return (new ActivityStreamsService())->siteOwnerResponse();
+        }
+
         $pageNumber = request()->query('page') ?? 1;
 
         $notes = Note::latest()->get();
diff --git a/app/Jobs/ProcessLike.php b/app/Jobs/ProcessLike.php
index e0394c87..753b44fa 100644
--- a/app/Jobs/ProcessLike.php
+++ b/app/Jobs/ProcessLike.php
@@ -5,7 +5,9 @@ declare(strict_types=1);
 namespace App\Jobs;
 
 use App\Models\Like;
+use Codebird\Codebird;
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Support\Arr;
 use Illuminate\Bus\Queueable;
 use Thujohn\Twitter\Facades\Twitter;
@@ -19,14 +21,18 @@ use Jonnybarnes\WebmentionsParser\Exceptions\AuthorshipParserException;
 
 class ProcessLike implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
 
+    /** @var Like */
     protected $like;
 
     /**
      * Create a new job instance.
      *
-     * @param  \App\Models\Like  $like
+     * @param Like $like
      */
     public function __construct(Like $like)
     {
@@ -36,14 +42,18 @@ class ProcessLike implements ShouldQueue
     /**
      * Execute the job.
      *
-     * @param  \GuzzleHttp\Client  $client
-     * @param  \Jonnybarnes\WebmentionsParser\Authorship  $authorship
+     * @param Client $client
+     * @param Authorship $authorship
      * @return int
+     * @throws GuzzleException
      */
     public function handle(Client $client, Authorship $authorship): int
     {
         if ($this->isTweet($this->like->url)) {
-            $tweet = Twitter::getOembed(['url' => $this->like->url]);
+            $codebird = resolve(Codebird::class);
+
+            $tweet = $codebird->statuses_oembed(['url' => $this->like->url]);
+
             $this->like->author_name = $tweet->author_name;
             $this->like->author_url = $tweet->author_url;
             $this->like->content = $tweet->html;
diff --git a/app/Models/Note.php b/app/Models/Note.php
index 56fc3410..020a5ebb 100644
--- a/app/Models/Note.php
+++ b/app/Models/Note.php
@@ -5,6 +5,12 @@ declare(strict_types=1);
 namespace App\Models;
 
 use Cache;
+use Codebird\Codebird;
+use Exception;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Twitter;
 use Normalizer;
 use GuzzleHttp\Client;
@@ -29,7 +35,7 @@ class Note extends Model
     use SoftDeletes;
 
     /**
-     * The reges for matching lone usernames.
+     * The regex for matching lone usernames.
      *
      * @var string
      */
@@ -79,7 +85,7 @@ class Note extends Model
     /**
      * Define the relationship with tags.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return BelongsToMany
      */
     public function tags()
     {
@@ -89,7 +95,7 @@ class Note extends Model
     /**
      * Define the relationship with clients.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return BelongsTo
      */
     public function client()
     {
@@ -99,7 +105,7 @@ class Note extends Model
     /**
      * Define the relationship with webmentions.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
+     * @return MorphMany
      */
     public function webmentions()
     {
@@ -109,7 +115,7 @@ class Note extends Model
     /**
      * Define the relationship with places.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     * @return BelongsTo
      */
     public function place()
     {
@@ -119,7 +125,7 @@ class Note extends Model
     /**
      * Define the relationship with media.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return HasMany
      */
     public function media()
     {
@@ -346,13 +352,18 @@ class Note extends Model
         }
 
         try {
-            $oEmbed = Twitter::getOembed([
+            $codebird = resolve(Codebird::class);
+            $oEmbed = $codebird->statuses_oembed([
                 'url' => $this->in_reply_to,
                 'dnt' => true,
                 'align' => 'center',
                 'maxwidth' => 512,
             ]);
-        } catch (\Exception $e) {
+
+            if ($oEmbed->httpstatus >= 400) {
+                throw new Exception();
+            }
+        } catch (Exception $e) {
             return null;
         }
         Cache::put($tweetId, $oEmbed, ($oEmbed->cache_age));
diff --git a/app/Models/WebMention.php b/app/Models/WebMention.php
index 95a7f473..770f6e66 100644
--- a/app/Models/WebMention.php
+++ b/app/Models/WebMention.php
@@ -4,12 +4,14 @@ declare(strict_types=1);
 
 namespace App\Models;
 
-use Cache;
-use Twitter;
 use App\Traits\FilterHtml;
+use Codebird\Codebird;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Cache;
 use Jonnybarnes\WebmentionsParser\Authorship;
+use Jonnybarnes\WebmentionsParser\Exceptions\AuthorshipParserException;
 
 class WebMention extends Model
 {
@@ -32,7 +34,7 @@ class WebMention extends Model
     /**
      * Define the relationship.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
+     * @return MorphTo
      */
     public function commentable()
     {
@@ -43,12 +45,14 @@ class WebMention extends Model
      * Get the author of the webmention.
      *
      * @return array
+     * @throws AuthorshipParserException
      */
     public function getAuthorAttribute(): array
     {
         $authorship = new Authorship();
         $hCard = $authorship->findAuthor(json_decode($this->mf2, true));
-        if (array_key_exists('properties', $hCard) &&
+        if (
+            array_key_exists('properties', $hCard) &&
             array_key_exists('photo', $hCard['properties'])
         ) {
             $hCard['properties']['photo'][0] = $this->createPhotoLink($hCard['properties']['photo'][0]);
@@ -118,7 +122,8 @@ class WebMention extends Model
                 return Cache::get($url);
             }
             $username = ltrim(parse_url($url, PHP_URL_PATH), '/');
-            $info = Twitter::getUsers(['screen_name' => $username]);
+            $codebird = resolve(Codebird::class);
+            $info = $codebird->users_show(['screen_name' => $username]);
             $profile_image = $info->profile_image_url_https;
             Cache::put($url, $profile_image, 10080); //1 week
 
diff --git a/app/Observers/NoteObserver.php b/app/Observers/NoteObserver.php
index 28867836..6b711394 100644
--- a/app/Observers/NoteObserver.php
+++ b/app/Observers/NoteObserver.php
@@ -12,11 +12,11 @@ class NoteObserver
     /**
      * Listen to the Note created event.
      *
-     * @param  \App\Note  $note
+     * @param Note $note
      */
     public function created(Note $note)
     {
-        $text = array_get($note->getAttributes(), 'note');
+        $text = Arr::get($note->getAttributes(), 'note');
         if ($text === null) {
             return;
         }
@@ -36,7 +36,7 @@ class NoteObserver
     /**
      * Listen to the Note updated event.
      *
-     * @param  \App\Note  $Note
+     * @param Note $note
      */
     public function updated(Note $note)
     {
@@ -62,7 +62,7 @@ class NoteObserver
     /**
      * Listen to the Note deleting event.
      *
-     * @param  \App\Note  $note
+     * @param Note $note
      */
     public function deleting(Note $note)
     {
@@ -72,8 +72,8 @@ class NoteObserver
     /**
      * Retrieve the tags from a note’s text, tag for form #tag.
      *
-     * @param  string  $note
-     * @return \Illuminate\Support\Collection
+     * @param string $note
+     * @return Collection
      */
     private function getTagsFromNote(string $note): Collection
     {
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 8c472721..325408c5 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -3,6 +3,7 @@
 namespace App\Providers;
 
 use App\Models\Note;
+use Codebird\Codebird;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use App\Observers\NoteObserver;
@@ -29,6 +30,23 @@ class AppServiceProvider extends ServiceProvider
         $this->app->bind('Intervention\Image\ImageManager', function () {
             return new \Intervention\Image\ImageManager(['driver' => config('image.driver')]);
         });
+
+        // Bind the Codebird client
+        $this->app->bind('Codebird\Codebird', function () {
+            Codebird::setConsumerKey(
+                env('TWITTER_CONSUMER_KEY'),
+                env('TWITTER_CONSUMER_SECRET')
+            );
+
+            $cb = Codebird::getInstance();
+
+            $cb->setToken(
+                env('TWITTER_ACCESS_TOKEN'),
+                env('TWITTER_ACCESS_TOKEN_SECRET')
+            );
+
+            return $cb;
+        });
     }
 
     /**
diff --git a/composer.json b/composer.json
index 848abb63..1d576568 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,8 @@
     ],
     "license": "CC0-1.0",
     "require": {
-        "php": ">=7.2.0",
+        "php": "^7.2",
+        "ext-intl": "*",
         "ext-json": "*",
         "cviebrock/eloquent-sluggable": "~6.0",
         "fideloper/proxy": "~4.0",
@@ -19,6 +20,7 @@
         "jonnybarnes/emoji-a11y": "^0.3",
         "jonnybarnes/indieweb": "dev-master",
         "jonnybarnes/webmentions-parser": "0.4.*",
+        "jublonet/codebird-php": "4.0.0-beta.1",
         "laravel/framework": "^6.0",
         "laravel/horizon": "^3.0",
         "laravel/scout": "^7.0",
@@ -39,16 +41,14 @@
         "tgalopin/html-sanitizer": "^1.1"
     },
     "require-dev": {
-        "barryvdh/laravel-debugbar": "~3.0",
+        "barryvdh/laravel-debugbar": "^3.0",
         "beyondcode/laravel-dump-server": "^1.0",
-        "codedungeon/phpunit-result-printer": "^0.26.0",
-        "filp/whoops": "~2.0",
-        "fzaninotto/faker": "~1.4",
+        "facade/ignition": "^1.4",
+        "fzaninotto/faker": "^1.4",
         "laravel/dusk": "^5.0",
-        "mockery/mockery": "~1.0",
+        "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^3.0",
-        "phpunit/phpunit": "~8.0",
-        "symfony/thanks": "~1.0"
+        "phpunit/phpunit": "^8.0"
     },
     "config": {
         "optimize-autoloader": true,
diff --git a/composer.lock b/composer.lock
index 302fb8ce..d52462ec 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5638d37827f787cc396ea3d19c8d1dc8",
+    "content-hash": "ea7315d3e96f5a0cb7a28dbaac8cf34a",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.112.25",
+            "version": "3.112.28",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "f91e264e3cbf8ced5c93f5f786c9e0f079926749"
+                "reference": "dabae6df3fd53b470da8806d641d05dbb66859da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f91e264e3cbf8ced5c93f5f786c9e0f079926749",
-                "reference": "f91e264e3cbf8ced5c93f5f786c9e0f079926749",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/dabae6df3fd53b470da8806d641d05dbb66859da",
+                "reference": "dabae6df3fd53b470da8806d641d05dbb66859da",
                 "shasum": ""
             },
             "require": {
@@ -87,7 +87,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2019-10-18T18:08:55+00:00"
+            "time": "2019-10-24T18:14:24+00:00"
         },
         {
             "name": "bosnadev/database",
@@ -266,6 +266,128 @@
             ],
             "time": "2019-01-31T20:38:55+00:00"
         },
+        {
+            "name": "composer/installers",
+            "version": "v1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/installers.git",
+                "reference": "141b272484481432cda342727a427dc1e206bfa0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/installers/zipball/141b272484481432cda342727a427dc1e206bfa0",
+                "reference": "141b272484481432cda342727a427dc1e206bfa0",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0"
+            },
+            "replace": {
+                "roundcube/plugin-installer": "*",
+                "shama/baton": "*"
+            },
+            "require-dev": {
+                "composer/composer": "1.0.*@dev",
+                "phpunit/phpunit": "^4.8.36"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "Composer\\Installers\\Plugin",
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Installers\\": "src/Composer/Installers"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kyle Robinson Young",
+                    "email": "kyle@dontkry.com",
+                    "homepage": "https://github.com/shama"
+                }
+            ],
+            "description": "A multi-framework Composer library installer",
+            "homepage": "https://composer.github.io/installers/",
+            "keywords": [
+                "Craft",
+                "Dolibarr",
+                "Eliasis",
+                "Hurad",
+                "ImageCMS",
+                "Kanboard",
+                "Lan Management System",
+                "MODX Evo",
+                "Mautic",
+                "Maya",
+                "OXID",
+                "Plentymarkets",
+                "Porto",
+                "RadPHP",
+                "SMF",
+                "Thelia",
+                "Whmcs",
+                "WolfCMS",
+                "agl",
+                "aimeos",
+                "annotatecms",
+                "attogram",
+                "bitrix",
+                "cakephp",
+                "chef",
+                "cockpit",
+                "codeigniter",
+                "concrete5",
+                "croogo",
+                "dokuwiki",
+                "drupal",
+                "eZ Platform",
+                "elgg",
+                "expressionengine",
+                "fuelphp",
+                "grav",
+                "installer",
+                "itop",
+                "joomla",
+                "known",
+                "kohana",
+                "laravel",
+                "lavalite",
+                "lithium",
+                "magento",
+                "majima",
+                "mako",
+                "mediawiki",
+                "modulework",
+                "modx",
+                "moodle",
+                "osclass",
+                "phpbb",
+                "piwik",
+                "ppi",
+                "puppet",
+                "pxcms",
+                "reindex",
+                "roundcube",
+                "shopware",
+                "silverstripe",
+                "sydes",
+                "symfony",
+                "typo3",
+                "wordpress",
+                "yawik",
+                "zend",
+                "zikula"
+            ],
+            "time": "2019-08-12T15:00:31+00:00"
+        },
         {
             "name": "cviebrock/eloquent-sluggable",
             "version": "6.0.2",
@@ -1029,27 +1151,28 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.3.3",
+            "version": "6.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
+                "reference": "0895c932405407fd3a7368b6910c09a24d26db11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11",
+                "reference": "0895c932405407fd3a7368b6910c09a24d26db11",
                 "shasum": ""
             },
             "require": {
+                "ext-json": "*",
                 "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.4",
+                "guzzlehttp/psr7": "^1.6.1",
                 "php": ">=5.5"
             },
             "require-dev": {
                 "ext-curl": "*",
                 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-                "psr/log": "^1.0"
+                "psr/log": "^1.1"
             },
             "suggest": {
                 "psr/log": "Required for using the Log middleware"
@@ -1061,12 +1184,12 @@
                 }
             },
             "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
                 "psr-4": {
                     "GuzzleHttp\\": "src/"
-                }
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1090,7 +1213,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2018-04-22T15:46:56+00:00"
+            "time": "2019-10-23T15:58:00+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -1694,17 +1817,76 @@
             "time": "2017-01-27T18:17:56+00:00"
         },
         {
-            "name": "laravel/framework",
-            "version": "v6.3.0",
+            "name": "jublonet/codebird-php",
+            "version": "4.0.0-beta.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/laravel/framework.git",
-                "reference": "80914c430fb5e49f492812d704ba6aeec03d80a2"
+                "url": "https://github.com/jublonet/codebird-php.git",
+                "reference": "df362d8ad629aad6c4c7dbf36a440e569ec41368"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/80914c430fb5e49f492812d704ba6aeec03d80a2",
-                "reference": "80914c430fb5e49f492812d704ba6aeec03d80a2",
+                "url": "https://api.github.com/repos/jublonet/codebird-php/zipball/df362d8ad629aad6c4c7dbf36a440e569ec41368",
+                "reference": "df362d8ad629aad6c4c7dbf36a440e569ec41368",
+                "shasum": ""
+            },
+            "require": {
+                "composer/installers": "~1.0",
+                "ext-hash": "*",
+                "ext-json": "*",
+                "lib-openssl": "*",
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": ">=0.6",
+                "phpunit/phpunit": ">=7.3",
+                "squizlabs/php_codesniffer": "2.*"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-3.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Joshua Atkins",
+                    "email": "joshua.atkins@jublo.net",
+                    "homepage": "http://atkins.im/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "J.M.",
+                    "email": "jm@jublo.net",
+                    "homepage": "http://mynetx.net/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Easy access to the Twitter REST API, Direct Messages API, Account Activity API, TON (Object Nest) API and Twitter Ads API — all from one PHP library.",
+            "homepage": "https://www.jublo.net/projects/codebird/php",
+            "keywords": [
+                "api",
+                "networking",
+                "twitter"
+            ],
+            "time": "2018-08-16T00:07:08+00:00"
+        },
+        {
+            "name": "laravel/framework",
+            "version": "v6.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/framework.git",
+                "reference": "bbaf5e956cb24512c48fc31129a5e357a09a8ea1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/bbaf5e956cb24512c48fc31129a5e357a09a8ea1",
+                "reference": "bbaf5e956cb24512c48fc31129a5e357a09a8ea1",
                 "shasum": ""
             },
             "require": {
@@ -1837,20 +2019,20 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2019-10-15T13:38:24+00:00"
+            "time": "2019-10-23T13:29:43+00:00"
         },
         {
             "name": "laravel/horizon",
-            "version": "v3.4.1",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/horizon.git",
-                "reference": "6279319c0cc35aa9a87490f58ac59e4ca78d4112"
+                "reference": "d3bbfd72413357a5c509b67eee93b67a5a94ba65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/horizon/zipball/6279319c0cc35aa9a87490f58ac59e4ca78d4112",
-                "reference": "6279319c0cc35aa9a87490f58ac59e4ca78d4112",
+                "url": "https://api.github.com/repos/laravel/horizon/zipball/d3bbfd72413357a5c509b67eee93b67a5a94ba65",
+                "reference": "d3bbfd72413357a5c509b67eee93b67a5a94ba65",
                 "shasum": ""
             },
             "require": {
@@ -1906,7 +2088,7 @@
                 "laravel",
                 "queue"
             ],
-            "time": "2019-10-08T16:18:52+00:00"
+            "time": "2019-10-21T13:46:02+00:00"
         },
         {
             "name": "laravel/scout",
@@ -2847,16 +3029,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.25.2",
+            "version": "2.25.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f"
+                "reference": "d07636581795383e2fea2d711212d30f941f2039"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/443fe5f1498147e0fbc792142b5dc43e2e8a533f",
-                "reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d07636581795383e2fea2d711212d30f941f2039",
+                "reference": "d07636581795383e2fea2d711212d30f941f2039",
                 "shasum": ""
             },
             "require": {
@@ -2910,7 +3092,7 @@
                 "datetime",
                 "time"
             ],
-            "time": "2019-10-14T14:18:59+00:00"
+            "time": "2019-10-20T11:05:44+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -2965,16 +3147,16 @@
         },
         {
             "name": "opis/closure",
-            "version": "3.4.0",
+            "version": "3.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/opis/closure.git",
-                "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7"
+                "reference": "e79f851749c3caa836d7ccc01ede5828feb762c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/opis/closure/zipball/60a97fff133b1669a5b1776aa8ab06db3f3962b7",
-                "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7",
+                "url": "https://api.github.com/repos/opis/closure/zipball/e79f851749c3caa836d7ccc01ede5828feb762c7",
+                "reference": "e79f851749c3caa836d7ccc01ede5828feb762c7",
                 "shasum": ""
             },
             "require": {
@@ -3022,7 +3204,7 @@
                 "serialization",
                 "serialize"
             ],
-            "time": "2019-09-02T21:07:33+00:00"
+            "time": "2019-10-19T18:38:51+00:00"
         },
         {
             "name": "p3k/http",
@@ -3426,16 +3608,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.1.0",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+                "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2",
+                "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2",
                 "shasum": ""
             },
             "require": {
@@ -3444,7 +3626,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
@@ -3469,7 +3651,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2018-11-20T15:27:04+00:00"
+            "time": "2019-10-25T08:06:51+00:00"
         },
         {
             "name": "psr/simple-cache",
@@ -5578,20 +5760,21 @@
         },
         {
             "name": "tgalopin/html-sanitizer",
-            "version": "1.2.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tgalopin/html-sanitizer.git",
-                "reference": "858f83aff56a6cdd36747b010116be12da6a4cfb"
+                "reference": "8ca76a6ce8c7d66f38a9101769af63bfb5626439"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tgalopin/html-sanitizer/zipball/858f83aff56a6cdd36747b010116be12da6a4cfb",
-                "reference": "858f83aff56a6cdd36747b010116be12da6a4cfb",
+                "url": "https://api.github.com/repos/tgalopin/html-sanitizer/zipball/8ca76a6ce8c7d66f38a9101769af63bfb5626439",
+                "reference": "8ca76a6ce8c7d66f38a9101769af63bfb5626439",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-intl": "*",
                 "league/uri-parser": "^1.4.1",
                 "masterminds/html5": "^2.4",
                 "php": ">=7.1",
@@ -5618,25 +5801,27 @@
                 }
             ],
             "description": "Sanitize untrustworthy HTML user input",
-            "time": "2019-04-05T08:47:19+00:00"
+            "time": "2019-10-24T14:52:22+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
-            "version": "2.2.1",
+            "version": "2.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
-                "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757"
+                "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757",
-                "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757",
+                "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/dda2ee426acd6d801d5b7fd1001cde9b5f790e15",
+                "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15",
                 "shasum": ""
             },
             "require": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
                 "php": "^5.5 || ^7.0",
-                "symfony/css-selector": "^2.7 || ^3.0 || ^4.0"
+                "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
@@ -5665,7 +5850,7 @@
             ],
             "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
             "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
-            "time": "2017-11-27T11:13:29+00:00"
+            "time": "2019-10-24T08:53:34+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
@@ -5726,51 +5911,6 @@
         }
     ],
     "packages-dev": [
-        {
-            "name": "2bj/phanybar",
-            "version": "v1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/2bj/Phanybar.git",
-                "reference": "88ff671e18f30c2047a34f8cf2465a7ff93c819b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/2bj/Phanybar/zipball/88ff671e18f30c2047a34f8cf2465a7ff93c819b",
-                "reference": "88ff671e18f30c2047a34f8cf2465a7ff93c819b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "bin": [
-                "bin/phanybar"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Bakyt\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bakyt Turgumbaev",
-                    "email": "dev2bj@gmail.com"
-                }
-            ],
-            "description": "Control AnyBar from your php",
-            "keywords": [
-                "anybar",
-                "phanybar"
-            ],
-            "time": "2015-03-06T12:14:28+00:00"
-        },
         {
             "name": "barryvdh/laravel-debugbar",
             "version": "v3.2.8",
@@ -5900,103 +6040,6 @@
             ],
             "time": "2019-08-11T13:17:40+00:00"
         },
-        {
-            "name": "codedungeon/php-cli-colors",
-            "version": "1.10.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/mikeerickson/php-cli-colors.git",
-                "reference": "5649ef76ec0c9ed626e95bf40fdfaf4b8efcf79b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/mikeerickson/php-cli-colors/zipball/5649ef76ec0c9ed626e95bf40fdfaf4b8efcf79b",
-                "reference": "5649ef76ec0c9ed626e95bf40fdfaf4b8efcf79b",
-                "shasum": ""
-            },
-            "require-dev": {
-                "phpunit/phpunit": ">=5.2"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Codedungeon\\PHPCliColors\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike Erickson",
-                    "email": "codedungeon@gmail.com"
-                }
-            ],
-            "description": "PHP Package for using color output in CLI commands",
-            "homepage": "https://github.com/mikeerickson/php-cli-colors",
-            "keywords": [
-                "color",
-                "colors",
-                "composer",
-                "package",
-                "php"
-            ],
-            "time": "2018-05-17T01:34:14+00:00"
-        },
-        {
-            "name": "codedungeon/phpunit-result-printer",
-            "version": "0.26.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/mikeerickson/phpunit-pretty-result-printer.git",
-                "reference": "89f1664579d8732e987bf5db1f689dab39d19d36"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/mikeerickson/phpunit-pretty-result-printer/zipball/89f1664579d8732e987bf5db1f689dab39d19d36",
-                "reference": "89f1664579d8732e987bf5db1f689dab39d19d36",
-                "shasum": ""
-            },
-            "require": {
-                "2bj/phanybar": "^1.0",
-                "codedungeon/php-cli-colors": "^1.10.2",
-                "hassankhan/config": "^0.11.2",
-                "php": "^7.1",
-                "phpunit/phpunit": "^8.0",
-                "symfony/yaml": "^2.7|^3.0|^4.0"
-            },
-            "require-dev": {
-                "spatie/phpunit-watcher": "^1.6"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Codedungeon\\PHPUnitPrettyResultPrinter\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike Erickson",
-                    "email": "codedungeon@gmail.com"
-                }
-            ],
-            "description": "PHPUnit Pretty Result Printer",
-            "keywords": [
-                "TDD",
-                "composer",
-                "package",
-                "phpunit",
-                "printer",
-                "result-printer",
-                "testing"
-            ],
-            "time": "2019-04-02T17:06:04+00:00"
-        },
         {
             "name": "doctrine/instantiator",
             "version": "1.2.0",
@@ -6053,6 +6096,175 @@
             ],
             "time": "2019-03-17T17:37:11+00:00"
         },
+        {
+            "name": "facade/flare-client-php",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/facade/flare-client-php.git",
+                "reference": "608c2be3157b09f1868ca97ea4ddf3434ee83d63"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/facade/flare-client-php/zipball/608c2be3157b09f1868ca97ea4ddf3434ee83d63",
+                "reference": "608c2be3157b09f1868ca97ea4ddf3434ee83d63",
+                "shasum": ""
+            },
+            "require": {
+                "facade/ignition-contracts": "~1.0",
+                "illuminate/pipeline": "~5.5|~5.6|~5.7|~5.8|^6.0",
+                "php": "^7.1",
+                "symfony/http-foundation": "~3.3|~4.1",
+                "symfony/var-dumper": "^3.4|^4.0"
+            },
+            "require-dev": {
+                "larapack/dd": "^1.1",
+                "phpunit/phpunit": "^7.5.16",
+                "spatie/phpunit-snapshot-assertions": "^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Facade\\FlareClient\\": "src"
+                },
+                "files": [
+                    "src/helpers.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Send PHP errors to Flare",
+            "homepage": "https://github.com/facade/flare-client-php",
+            "keywords": [
+                "exception",
+                "facade",
+                "flare",
+                "reporting"
+            ],
+            "time": "2019-10-07T19:15:46+00:00"
+        },
+        {
+            "name": "facade/ignition",
+            "version": "1.11.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/facade/ignition.git",
+                "reference": "862cbc2dfffa1fa28b47822a116e5b2e03b421db"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/facade/ignition/zipball/862cbc2dfffa1fa28b47822a116e5b2e03b421db",
+                "reference": "862cbc2dfffa1fa28b47822a116e5b2e03b421db",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "facade/flare-client-php": "^1.1",
+                "facade/ignition-contracts": "^1.0",
+                "filp/whoops": "^2.4",
+                "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0",
+                "monolog/monolog": "^1.12 || ^2.0",
+                "php": "^7.1",
+                "scrivo/highlight.php": "^9.15",
+                "symfony/console": "^3.4 || ^4.0",
+                "symfony/var-dumper": "^3.4 || ^4.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^2.14",
+                "mockery/mockery": "^1.2",
+                "orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0"
+            },
+            "suggest": {
+                "laravel/telescope": "^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Facade\\Ignition\\IgnitionServiceProvider"
+                    ],
+                    "aliases": {
+                        "Flare": "Facade\\Ignition\\Facades\\Flare"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Facade\\Ignition\\": "src"
+                },
+                "files": [
+                    "src/helpers.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A beautiful error page for Laravel applications.",
+            "homepage": "https://github.com/facade/ignition",
+            "keywords": [
+                "error",
+                "flare",
+                "laravel",
+                "page"
+            ],
+            "time": "2019-10-13T10:42:06+00:00"
+        },
+        {
+            "name": "facade/ignition-contracts",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/facade/ignition-contracts.git",
+                "reference": "f445db0fb86f48e205787b2592840dd9c80ded28"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/f445db0fb86f48e205787b2592840dd9c80ded28",
+                "reference": "f445db0fb86f48e205787b2592840dd9c80ded28",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Facade\\IgnitionContracts\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Freek Van der Herten",
+                    "email": "freek@spatie.be",
+                    "homepage": "https://flareapp.io",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Solution contracts for Ignition",
+            "homepage": "https://github.com/facade/ignition-contracts",
+            "keywords": [
+                "contracts",
+                "flare",
+                "ignition"
+            ],
+            "time": "2019-08-30T14:06:08+00:00"
+        },
         {
             "name": "facebook/webdriver",
             "version": "1.7.1",
@@ -6272,63 +6484,6 @@
             ],
             "time": "2016-01-20T08:20:44+00:00"
         },
-        {
-            "name": "hassankhan/config",
-            "version": "0.11.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hassankhan/config.git",
-                "reference": "7fbc236c32dc6cc53a7b00992a2739cf8b41c085"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hassankhan/config/zipball/7fbc236c32dc6cc53a7b00992a2739cf8b41c085",
-                "reference": "7fbc236c32dc6cc53a7b00992a2739cf8b41c085",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0",
-                "scrutinizer/ocular": "~1.1",
-                "squizlabs/php_codesniffer": "~2.2"
-            },
-            "suggest": {
-                "symfony/yaml": "~2.5"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Noodlehaus\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Hassan Khan",
-                    "homepage": "http://hassankhan.me/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Lightweight configuration file loader that supports PHP, INI, XML, JSON, and YAML files",
-            "homepage": "http://hassankhan.me/config/",
-            "keywords": [
-                "config",
-                "configuration",
-                "ini",
-                "json",
-                "microphp",
-                "unframework",
-                "xml",
-                "yaml",
-                "yml"
-            ],
-            "time": "2017-11-07T22:49:43+00:00"
-        },
         {
             "name": "laravel/dusk",
             "version": "v5.5.2",
@@ -7897,108 +8052,6 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "time": "2016-10-03T07:35:21+00:00"
         },
-        {
-            "name": "symfony/thanks",
-            "version": "v1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/thanks.git",
-                "reference": "9474a631b52737c623b6aeba22f00bbc003251da"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/thanks/zipball/9474a631b52737c623b6aeba22f00bbc003251da",
-                "reference": "9474a631b52737c623b6aeba22f00bbc003251da",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.0",
-                "php": "^5.5.9|^7.0.0"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                },
-                "class": "Symfony\\Thanks\\Thanks"
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Thanks\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                }
-            ],
-            "description": "Give thanks (in the form of a GitHub ⭐) to your fellow PHP package maintainers (not limited to Symfony components)!",
-            "time": "2018-08-24T14:08:13+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v4.3.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/41e16350a2a1c7383c4735aa2f9fce74cf3d1178",
-                "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "conflict": {
-                "symfony/console": "<3.4"
-            },
-            "require-dev": {
-                "symfony/console": "~3.4|~4.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2019-09-11T15:41:19+00:00"
-        },
         {
             "name": "theseer/tokenizer",
             "version": "1.1.3",
@@ -8098,7 +8151,9 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.2.0"
+        "php": "^7.2",
+        "ext-intl": "*",
+        "ext-json": "*"
     },
     "platform-dev": []
 }
diff --git a/package-lock.json b/package-lock.json
index 0e0fc9a2..6ca1ee8a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,18 +14,18 @@
             }
         },
         "@babel/core": {
-            "version": "7.5.5",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz",
-            "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==",
+            "version": "7.6.4",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.6.4.tgz",
+            "integrity": "sha512-Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "^7.5.5",
-                "@babel/generator": "^7.5.5",
-                "@babel/helpers": "^7.5.5",
-                "@babel/parser": "^7.5.5",
-                "@babel/template": "^7.4.4",
-                "@babel/traverse": "^7.5.5",
-                "@babel/types": "^7.5.5",
+                "@babel/generator": "^7.6.4",
+                "@babel/helpers": "^7.6.2",
+                "@babel/parser": "^7.6.4",
+                "@babel/template": "^7.6.0",
+                "@babel/traverse": "^7.6.3",
+                "@babel/types": "^7.6.3",
                 "convert-source-map": "^1.1.0",
                 "debug": "^4.1.0",
                 "json5": "^2.1.0",
@@ -45,9 +45,9 @@
                     }
                 },
                 "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.1",
+                    "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
+                    "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
                     "dev": true,
                     "requires": {
                         "minimist": "^1.2.0"
@@ -62,16 +62,15 @@
             }
         },
         "@babel/generator": {
-            "version": "7.5.5",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz",
-            "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==",
+            "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.5.5",
+                "@babel/types": "^7.6.3",
                 "jsesc": "^2.5.1",
                 "lodash": "^4.17.13",
-                "source-map": "^0.5.0",
-                "trim-right": "^1.0.1"
+                "source-map": "^0.5.0"
             }
         },
         "@babel/helper-function-name": {
@@ -104,14 +103,14 @@
             }
         },
         "@babel/helpers": {
-            "version": "7.5.5",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz",
-            "integrity": "sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==",
+            "version": "7.6.2",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.2.tgz",
+            "integrity": "sha512-3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==",
             "dev": true,
             "requires": {
-                "@babel/template": "^7.4.4",
-                "@babel/traverse": "^7.5.5",
-                "@babel/types": "^7.5.5"
+                "@babel/template": "^7.6.0",
+                "@babel/traverse": "^7.6.2",
+                "@babel/types": "^7.6.0"
             }
         },
         "@babel/highlight": {
@@ -126,34 +125,34 @@
             }
         },
         "@babel/parser": {
-            "version": "7.5.5",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz",
-            "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==",
+            "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/template": {
-            "version": "7.4.4",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
-            "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
+            "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.4.4",
-                "@babel/types": "^7.4.4"
+                "@babel/parser": "^7.6.0",
+                "@babel/types": "^7.6.0"
             }
         },
         "@babel/traverse": {
-            "version": "7.5.5",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz",
-            "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==",
+            "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.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.5.5",
-                "@babel/types": "^7.5.5",
+                "@babel/parser": "^7.6.3",
+                "@babel/types": "^7.6.3",
                 "debug": "^4.1.0",
                 "globals": "^11.1.0",
                 "lodash": "^4.17.13"
@@ -171,9 +170,9 @@
             }
         },
         "@babel/types": {
-            "version": "7.5.5",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz",
-            "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==",
+            "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",
@@ -191,12 +190,40 @@
                 "glob-to-regexp": "^0.3.0"
             }
         },
+        "@nodelib/fs.scandir": {
+            "version": "2.1.3",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
+            "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
+            "dev": true,
+            "requires": {
+                "@nodelib/fs.stat": "2.0.3",
+                "run-parallel": "^1.1.9"
+            },
+            "dependencies": {
+                "@nodelib/fs.stat": {
+                    "version": "2.0.3",
+                    "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
+                    "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
+                    "dev": true
+                }
+            }
+        },
         "@nodelib/fs.stat": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
             "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
             "dev": true
         },
+        "@nodelib/fs.walk": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
+            "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
+            "dev": true,
+            "requires": {
+                "@nodelib/fs.scandir": "2.1.3",
+                "fastq": "^1.6.0"
+            }
+        },
         "@samverschueren/stream-to-observable": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz",
@@ -463,9 +490,9 @@
             "dev": true
         },
         "acorn": {
-            "version": "6.2.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz",
-            "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==",
+            "version": "6.3.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
+            "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
             "dev": true
         },
         "agent-base": {
@@ -476,6 +503,24 @@
                 "es6-promisify": "^5.0.0"
             }
         },
+        "aggregate-error": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz",
+            "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==",
+            "dev": true,
+            "requires": {
+                "clean-stack": "^2.0.0",
+                "indent-string": "^4.0.0"
+            },
+            "dependencies": {
+                "indent-string": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+                    "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+                    "dev": true
+                }
+            }
+        },
         "ajv": {
             "version": "6.10.2",
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
@@ -811,9 +856,9 @@
             "dev": true
         },
         "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",
@@ -828,25 +873,45 @@
             "dev": true
         },
         "autoprefixer": {
-            "version": "9.6.1",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz",
-            "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==",
+            "version": "9.6.5",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.5.tgz",
+            "integrity": "sha512-rGd50YV8LgwFQ2WQp4XzOTG69u1qQsXn0amww7tjqV5jJuNazgFKYEVItEBngyyvVITKOg20zr2V+9VsrXJQ2g==",
             "dev": true,
             "requires": {
-                "browserslist": "^4.6.3",
-                "caniuse-lite": "^1.0.30000980",
+                "browserslist": "^4.7.0",
+                "caniuse-lite": "^1.0.30000999",
                 "chalk": "^2.4.2",
                 "normalize-range": "^0.1.2",
                 "num2fraction": "^1.2.2",
-                "postcss": "^7.0.17",
-                "postcss-value-parser": "^4.0.0"
+                "postcss": "^7.0.18",
+                "postcss-value-parser": "^4.0.2"
             },
             "dependencies": {
-                "postcss-value-parser": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz",
-                    "integrity": "sha512-ESPktioptiSUchCKgggAkzdmkgzKfmp0EU8jXH+5kbIUB+unr0Y4CY9SRMvibuvYUBjNh1ACLbxqYNpdTQOteQ==",
+                "postcss": {
+                    "version": "7.0.18",
+                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.18.tgz",
+                    "integrity": "sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==",
+                    "dev": true,
+                    "requires": {
+                        "chalk": "^2.4.2",
+                        "source-map": "^0.6.1",
+                        "supports-color": "^6.1.0"
+                    }
+                },
+                "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"
+                    }
                 }
             }
         },
@@ -929,9 +994,9 @@
             }
         },
         "base64-js": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
-            "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+            "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
             "dev": true
         },
         "bcrypt-pbkdf": {
@@ -965,9 +1030,9 @@
             }
         },
         "bluebird": {
-            "version": "3.5.5",
-            "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
-            "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
+            "version": "3.7.1",
+            "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz",
+            "integrity": "sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==",
             "dev": true
         },
         "bn.js": {
@@ -1072,14 +1137,14 @@
             }
         },
         "browserslist": {
-            "version": "4.6.6",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz",
-            "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==",
+            "version": "4.7.1",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.7.1.tgz",
+            "integrity": "sha512-QtULFqKIAtiyNx7NhZ/p4rB8m3xDozVo/pi5VgTlADLF2tNigz/QH+v0m5qhn7XfHT7u+607NcCNOnC0HZAlMg==",
             "dev": true,
             "requires": {
-                "caniuse-lite": "^1.0.30000984",
-                "electron-to-chromium": "^1.3.191",
-                "node-releases": "^1.1.25"
+                "caniuse-lite": "^1.0.30000999",
+                "electron-to-chromium": "^1.3.284",
+                "node-releases": "^1.1.36"
             }
         },
         "buffer": {
@@ -1111,9 +1176,9 @@
             "dev": true
         },
         "cacache": {
-            "version": "11.3.3",
-            "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz",
-            "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==",
+            "version": "12.0.3",
+            "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz",
+            "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
             "dev": true,
             "requires": {
                 "bluebird": "^3.5.5",
@@ -1121,6 +1186,7 @@
                 "figgy-pudding": "^3.5.1",
                 "glob": "^7.1.4",
                 "graceful-fs": "^4.1.15",
+                "infer-owner": "^1.0.3",
                 "lru-cache": "^5.1.1",
                 "mississippi": "^3.0.0",
                 "mkdirp": "^0.5.1",
@@ -1142,9 +1208,9 @@
                     }
                 },
                 "yallist": {
-                    "version": "3.0.3",
-                    "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-                    "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+                    "version": "3.1.1",
+                    "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+                    "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
                     "dev": true
                 }
             }
@@ -1221,9 +1287,9 @@
             }
         },
         "caniuse-lite": {
-            "version": "1.0.30000984",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000984.tgz",
-            "integrity": "sha512-n5tKOjMaZ1fksIpQbjERuqCyfgec/m9pferkFQbLmWtqLUdmt12hNhjSwsmPdqeiG2NkITOQhr1VYIwWSAceiA==",
+            "version": "1.0.30000999",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz",
+            "integrity": "sha512-1CUyKyecPeksKwXZvYw0tEoaMCo/RwBlXmEtN5vVnabvO0KPd9RQLcaAuR9/1F+KDMv6esmOFWlsXuzDk+8rxg==",
             "dev": true
         },
         "caseless": {
@@ -1274,9 +1340,9 @@
             "dev": true
         },
         "chokidar": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
-            "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
+            "version": "2.1.8",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+            "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
             "dev": true,
             "requires": {
                 "anymatch": "^2.0.0",
@@ -1363,9 +1429,9 @@
             }
         },
         "chownr": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz",
-            "integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==",
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
+            "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
             "dev": true
         },
         "chrome-trace-event": {
@@ -1416,6 +1482,12 @@
                 }
             }
         },
+        "clean-stack": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+            "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+            "dev": true
+        },
         "cli-cursor": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
@@ -1492,15 +1564,14 @@
             }
         },
         "clone-deep": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
-            "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+            "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
             "dev": true,
             "requires": {
-                "for-own": "^1.0.0",
                 "is-plain-object": "^2.0.4",
-                "kind-of": "^6.0.0",
-                "shallow-clone": "^1.0.0"
+                "kind-of": "^6.0.2",
+                "shallow-clone": "^3.0.0"
             }
         },
         "clone-regexp": {
@@ -1567,9 +1638,9 @@
             }
         },
         "commander": {
-            "version": "2.20.0",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-            "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
+            "version": "2.20.3",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
             "dev": true
         },
         "commondir": {
@@ -1737,9 +1808,9 @@
             }
         },
         "css-loader": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.1.0.tgz",
-            "integrity": "sha512-MuL8WsF/KSrHCBCYaozBKlx+r7vIfUaDTEreo7wR7Vv3J6N0z6fqWjRk3e/6wjneitXN1r/Y9FTK1psYNOBdJQ==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.2.0.tgz",
+            "integrity": "sha512-QTF3Ud5H7DaZotgdcJjGMvyDj5F3Pn1j/sC6VBEOVp94cbwqyIBdcs/quzj4MC1BKQSrTpQznegH/5giYbhnCQ==",
             "dev": true,
             "requires": {
                 "camelcase": "^5.3.1",
@@ -1757,19 +1828,19 @@
             },
             "dependencies": {
                 "postcss-value-parser": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz",
-                    "integrity": "sha512-ESPktioptiSUchCKgggAkzdmkgzKfmp0EU8jXH+5kbIUB+unr0Y4CY9SRMvibuvYUBjNh1ACLbxqYNpdTQOteQ==",
+                    "version": "4.0.2",
+                    "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz",
+                    "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==",
                     "dev": true
                 },
                 "schema-utils": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.0.1.tgz",
-                    "integrity": "sha512-HJFKJ4JixDpRur06QHwi8uu2kZbng318ahWEKgBjc0ZklcE4FDvmm2wghb448q0IRaABxIESt8vqPFvwgMB80A==",
+                    "version": "2.5.0",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.5.0.tgz",
+                    "integrity": "sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==",
                     "dev": true,
                     "requires": {
-                        "ajv": "^6.1.0",
-                        "ajv-keywords": "^3.1.0"
+                        "ajv": "^6.10.2",
+                        "ajv-keywords": "^3.4.1"
                     }
                 }
             }
@@ -1790,9 +1861,9 @@
             }
         },
         "cyclist": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
-            "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+            "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
             "dev": true
         },
         "dashdash": {
@@ -1894,18 +1965,36 @@
             }
         },
         "del": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-            "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/del/-/del-5.1.0.tgz",
+            "integrity": "sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==",
             "dev": true,
             "requires": {
-                "@types/glob": "^7.1.1",
-                "globby": "^6.1.0",
-                "is-path-cwd": "^2.0.0",
-                "is-path-in-cwd": "^2.0.0",
-                "p-map": "^2.0.0",
-                "pify": "^4.0.1",
-                "rimraf": "^2.6.3"
+                "globby": "^10.0.1",
+                "graceful-fs": "^4.2.2",
+                "is-glob": "^4.0.1",
+                "is-path-cwd": "^2.2.0",
+                "is-path-inside": "^3.0.1",
+                "p-map": "^3.0.0",
+                "rimraf": "^3.0.0",
+                "slash": "^3.0.0"
+            },
+            "dependencies": {
+                "graceful-fs": {
+                    "version": "4.2.2",
+                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+                    "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+                    "dev": true
+                },
+                "rimraf": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz",
+                    "integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==",
+                    "dev": true,
+                    "requires": {
+                        "glob": "^7.1.3"
+                    }
+                }
             }
         },
         "delayed-stream": {
@@ -1974,13 +2063,27 @@
             }
         },
         "dom-serializer": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
-            "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz",
+            "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==",
             "dev": true,
             "requires": {
-                "domelementtype": "^1.3.0",
-                "entities": "^1.1.1"
+                "domelementtype": "^2.0.1",
+                "entities": "^2.0.0"
+            },
+            "dependencies": {
+                "domelementtype": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
+                    "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
+                    "dev": true
+                },
+                "entities": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+                    "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
+                    "dev": true
+                }
             }
         },
         "domain-browser": {
@@ -2046,9 +2149,9 @@
             }
         },
         "electron-to-chromium": {
-            "version": "1.3.194",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.194.tgz",
-            "integrity": "sha512-w0LHR2YD9Ex1o+Sz4IN2hYzCB8vaFtMNW+yJcBf6SZlVqgFahkne/4rGVJdk4fPF98Gch9snY7PiabOh+vqHNg==",
+            "version": "1.3.285",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.285.tgz",
+            "integrity": "sha512-DYR9KW723sUbGK++DCmCmM95AbNXT4Q0tlCFMcYijFjayhuDqlGYR68OemlP8MJj0gjkwdeItIUfd0oLCgw+4A==",
             "dev": true
         },
         "elegant-spinner": {
@@ -2058,9 +2161,9 @@
             "dev": true
         },
         "elliptic": {
-            "version": "6.5.0",
-            "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz",
-            "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==",
+            "version": "6.5.1",
+            "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz",
+            "integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==",
             "dev": true,
             "requires": {
                 "bn.js": "^4.4.0",
@@ -2085,23 +2188,35 @@
             "dev": true
         },
         "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==",
             "dev": true,
             "requires": {
                 "once": "^1.4.0"
             }
         },
         "enhanced-resolve": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
-            "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
+            "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
             "dev": true,
             "requires": {
                 "graceful-fs": "^4.1.2",
-                "memory-fs": "^0.4.0",
+                "memory-fs": "^0.5.0",
                 "tapable": "^1.0.0"
+            },
+            "dependencies": {
+                "memory-fs": {
+                    "version": "0.5.0",
+                    "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+                    "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+                    "dev": true,
+                    "requires": {
+                        "errno": "^0.1.3",
+                        "readable-stream": "^2.0.1"
+                    }
+                }
             }
         },
         "entities": {
@@ -2173,9 +2288,9 @@
             }
         },
         "estraverse": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-            "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+            "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
             "dev": true
         },
         "esutils": {
@@ -2538,6 +2653,15 @@
             "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
             "dev": true
         },
+        "fastq": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz",
+            "integrity": "sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==",
+            "dev": true,
+            "requires": {
+                "reusify": "^1.0.0"
+            }
+        },
         "fd-slicer": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
@@ -2796,15 +2920,6 @@
             "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
             "dev": true
         },
-        "for-own": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-            "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-            "dev": true,
-            "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",
@@ -3450,9 +3565,9 @@
             "dev": true
         },
         "get-own-enumerable-property-symbols": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz",
-            "integrity": "sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.1.tgz",
+            "integrity": "sha512-09/VS4iek66Dh2bctjRkowueRJbY1JDGR1L/zRxO1Qk8Uxs6PnqaNSqalpizPT+CDjre3hnEsuzvhgomz9qYrA==",
             "dev": true
         },
         "get-stdin": {
@@ -3567,22 +3682,76 @@
             "dev": true
         },
         "globby": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-            "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+            "version": "10.0.1",
+            "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz",
+            "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
             "dev": true,
             "requires": {
-                "array-union": "^1.0.1",
-                "glob": "^7.0.3",
-                "object-assign": "^4.0.1",
-                "pify": "^2.0.0",
-                "pinkie-promise": "^2.0.0"
+                "@types/glob": "^7.1.1",
+                "array-union": "^2.1.0",
+                "dir-glob": "^3.0.1",
+                "fast-glob": "^3.0.3",
+                "glob": "^7.1.3",
+                "ignore": "^5.1.1",
+                "merge2": "^1.2.3",
+                "slash": "^3.0.0"
             },
             "dependencies": {
-                "pify": {
-                    "version": "2.3.0",
-                    "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-                    "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+                "@nodelib/fs.stat": {
+                    "version": "2.0.3",
+                    "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
+                    "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
+                    "dev": true
+                },
+                "array-union": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+                    "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+                    "dev": true
+                },
+                "dir-glob": {
+                    "version": "3.0.1",
+                    "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+                    "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+                    "dev": true,
+                    "requires": {
+                        "path-type": "^4.0.0"
+                    }
+                },
+                "fast-glob": {
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.0.tgz",
+                    "integrity": "sha512-TrUz3THiq2Vy3bjfQUB2wNyPdGBeGmdjbzzBLhfHN4YFurYptCKwGq/TfiRavbGywFRzY6U2CdmQ1zmsY5yYaw==",
+                    "dev": true,
+                    "requires": {
+                        "@nodelib/fs.stat": "^2.0.2",
+                        "@nodelib/fs.walk": "^1.2.3",
+                        "glob-parent": "^5.1.0",
+                        "merge2": "^1.3.0",
+                        "micromatch": "^4.0.2"
+                    },
+                    "dependencies": {
+                        "merge2": {
+                            "version": "1.3.0",
+                            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz",
+                            "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==",
+                            "dev": true
+                        }
+                    }
+                },
+                "glob-parent": {
+                    "version": "5.1.0",
+                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
+                    "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+                    "dev": true,
+                    "requires": {
+                        "is-glob": "^4.0.1"
+                    }
+                },
+                "path-type": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+                    "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
                     "dev": true
                 }
             }
@@ -3763,9 +3932,9 @@
             "dev": true
         },
         "html-tags": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.0.0.tgz",
-            "integrity": "sha512-xiXEBjihaNI+VZ2mKEoI5ZPxqUsevTKM+aeeJ/W4KAg2deGE35minmCJMn51BvwJZmiHaeAxrb2LAS0yZJxuuA==",
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz",
+            "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
             "dev": true
         },
         "htmlparser2": {
@@ -3813,9 +3982,9 @@
             "dev": true
         },
         "https-proxy-agent": {
-            "version": "2.2.2",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz",
-            "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz",
+            "integrity": "sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==",
             "requires": {
                 "agent-base": "^4.3.0",
                 "debug": "^3.1.0"
@@ -3832,19 +4001,20 @@
             }
         },
         "husky": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/husky/-/husky-3.0.0.tgz",
-            "integrity": "sha512-lKMEn7bRK+7f5eWPNGclDVciYNQt0GIkAQmhKl+uHP1qFzoN0h92kmH9HZ8PCwyVA2EQPD8KHf0FYWqnTxau+Q==",
+            "version": "3.0.9",
+            "resolved": "https://registry.npmjs.org/husky/-/husky-3.0.9.tgz",
+            "integrity": "sha512-Yolhupm7le2/MqC1VYLk/cNmYxsSsqKkTyBhzQHhPK1jFnC89mmmNVuGtLNabjDI6Aj8UNIr0KpRNuBkiC4+sg==",
             "dev": true,
             "requires": {
+                "chalk": "^2.4.2",
+                "ci-info": "^2.0.0",
                 "cosmiconfig": "^5.2.1",
                 "execa": "^1.0.0",
                 "get-stdin": "^7.0.0",
-                "is-ci": "^2.0.0",
                 "opencollective-postinstall": "^2.0.2",
                 "pkg-dir": "^4.2.0",
-                "please-upgrade-node": "^3.1.1",
-                "read-pkg": "^5.1.1",
+                "please-upgrade-node": "^3.2.0",
+                "read-pkg": "^5.2.0",
                 "run-node": "^1.0.0",
                 "slash": "^3.0.0"
             }
@@ -3971,6 +4141,12 @@
             "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
             "dev": true
         },
+        "infer-owner": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+            "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+            "dev": true
+        },
         "inflight": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -4066,15 +4242,6 @@
             "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
             "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"
-            }
-        },
         "is-data-descriptor": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -4198,23 +4365,11 @@
             "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
             "dev": true
         },
-        "is-path-in-cwd": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-            "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-            "dev": true,
-            "requires": {
-                "is-path-inside": "^2.1.0"
-            }
-        },
         "is-path-inside": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-            "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-            "dev": true,
-            "requires": {
-                "path-is-inside": "^1.0.2"
-            }
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
+            "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
+            "dev": true
         },
         "is-plain-obj": {
             "version": "1.1.0",
@@ -4402,9 +4557,9 @@
             "dev": true
         },
         "known-css-properties": {
-            "version": "0.14.0",
-            "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.14.0.tgz",
-            "integrity": "sha512-P+0a/gBzLgVlCnK8I7VcD0yuYJscmWn66wH9tlKsQnmVdg689tLEmziwB9PuazZYLkcm07fvWOKCJJqI55sD5Q==",
+            "version": "0.16.0",
+            "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.16.0.tgz",
+            "integrity": "sha512-0g5vDDPvNnQk7WM/aE92dTDxXJoOE0biiIcUb3qkn/F6h/ZQZPlZIbE2XSXH2vFPfphkgCxuR2vH6HHnobEOaQ==",
             "dev": true
         },
         "lcid": {
@@ -4429,9 +4584,9 @@
             "dev": true
         },
         "lint-staged": {
-            "version": "9.2.0",
-            "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-9.2.0.tgz",
-            "integrity": "sha512-K/CQWcxYunc8lGMNTFvtI4+ybJcHW3K4Ghudz2OrJhIWdW/i1WWu9rGiVj4yJ0+D/xh8a08kp5slt89VZC9Eqg==",
+            "version": "9.4.2",
+            "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-9.4.2.tgz",
+            "integrity": "sha512-OFyGokJSWTn2M6vngnlLXjaHhi8n83VIZZ5/1Z26SULRUWgR3ITWpAEQC9Pnm3MC/EpCxlwts/mQWDHNji2+zA==",
             "dev": true,
             "requires": {
                 "chalk": "^2.4.2",
@@ -4439,23 +4594,35 @@
                 "cosmiconfig": "^5.2.1",
                 "debug": "^4.1.1",
                 "dedent": "^0.7.0",
-                "del": "^4.1.1",
-                "execa": "^2.0.1",
+                "del": "^5.0.0",
+                "execa": "^2.0.3",
                 "listr": "^0.14.3",
                 "log-symbols": "^3.0.0",
                 "micromatch": "^4.0.2",
+                "normalize-path": "^3.0.0",
                 "please-upgrade-node": "^3.1.1",
                 "string-argv": "^0.3.0",
                 "stringify-object": "^3.3.0"
             },
             "dependencies": {
-                "execa": {
-                    "version": "2.0.3",
-                    "resolved": "https://registry.npmjs.org/execa/-/execa-2.0.3.tgz",
-                    "integrity": "sha512-iM124nlyGSrXmuyZF1EMe83ESY2chIYVyDRZKgmcDynid2Q2v/+GuE7gNMl6Sy9Niwf4MC0DDxagOxeMPjuLsw==",
+                "cross-spawn": {
+                    "version": "7.0.1",
+                    "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz",
+                    "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==",
                     "dev": true,
                     "requires": {
-                        "cross-spawn": "^6.0.5",
+                        "path-key": "^3.1.0",
+                        "shebang-command": "^2.0.0",
+                        "which": "^2.0.1"
+                    }
+                },
+                "execa": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/execa/-/execa-2.1.0.tgz",
+                    "integrity": "sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==",
+                    "dev": true,
+                    "requires": {
+                        "cross-spawn": "^7.0.0",
                         "get-stream": "^5.0.0",
                         "is-stream": "^2.0.0",
                         "merge-stream": "^2.0.0",
@@ -4501,6 +4668,30 @@
                     "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz",
                     "integrity": "sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==",
                     "dev": true
+                },
+                "shebang-command": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+                    "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+                    "dev": true,
+                    "requires": {
+                        "shebang-regex": "^3.0.0"
+                    }
+                },
+                "shebang-regex": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+                    "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+                    "dev": true
+                },
+                "which": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/which/-/which-2.0.1.tgz",
+                    "integrity": "sha512-N7GBZOTswtB9lkQBZA4+zAXrjEIWAUOB93AvzUiudRzRxhUdLURQ7D/gAIMY1gatT/LTbmbcv8SiYazy3eYB7w==",
+                    "dev": true,
+                    "requires": {
+                        "isexe": "^2.0.0"
+                    }
                 }
             }
         },
@@ -4519,6 +4710,14 @@
                 "listr-verbose-renderer": "^0.5.0",
                 "p-map": "^2.0.0",
                 "rxjs": "^6.3.3"
+            },
+            "dependencies": {
+                "p-map": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+                    "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+                    "dev": true
+                }
             }
         },
         "listr-silent-renderer": {
@@ -4664,12 +4863,6 @@
             "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
             "dev": true
         },
-        "lodash.tail": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
-            "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=",
-            "dev": true
-        },
         "log-symbols": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
@@ -4991,24 +5184,6 @@
                 }
             }
         },
-        "mixin-object": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
-            "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
-            "dev": true,
-            "requires": {
-                "for-in": "^0.1.3",
-                "is-extendable": "^0.1.1"
-            },
-            "dependencies": {
-                "for-in": {
-                    "version": "0.1.8",
-                    "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
-                    "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
-                    "dev": true
-                }
-            }
-        },
         "mkdirp": {
             "version": "0.5.1",
             "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
@@ -5141,18 +5316,26 @@
             }
         },
         "node-releases": {
-            "version": "1.1.25",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.25.tgz",
-            "integrity": "sha512-fI5BXuk83lKEoZDdH3gRhtsNgh05/wZacuXkgbiYkceE7+QIMXOg98n9ZV7mz27B+kFHnqHcUpscZZlGRSmTpQ==",
+            "version": "1.1.36",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.36.tgz",
+            "integrity": "sha512-ggXhX6QGyJSjj3r+6ml2LqqC28XOWmKtpb+a15/Zpr9V3yoNazxJNlcQDS9bYaid5FReEWHEgToH1mwoUceWwg==",
             "dev": true,
             "requires": {
-                "semver": "^5.3.0"
+                "semver": "^6.3.0"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "6.3.0",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+                    "dev": true
+                }
             }
         },
         "node-sass": {
-            "version": "4.12.0",
-            "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
-            "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.0.tgz",
+            "integrity": "sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA==",
             "dev": true,
             "requires": {
                 "async-foreach": "^0.1.3",
@@ -5162,7 +5345,7 @@
                 "get-stdin": "^4.0.1",
                 "glob": "^7.0.3",
                 "in-publish": "^2.0.0",
-                "lodash": "^4.17.11",
+                "lodash": "^4.17.15",
                 "meow": "^3.7.0",
                 "mkdirp": "^0.5.1",
                 "nan": "^2.13.2",
@@ -5209,6 +5392,12 @@
                     "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
                     "dev": true
                 },
+                "lodash": {
+                    "version": "4.17.15",
+                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+                    "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+                    "dev": true
+                },
                 "supports-color": {
                     "version": "2.0.0",
                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -5454,9 +5643,9 @@
             "dev": true
         },
         "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==",
+            "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"
@@ -5472,10 +5661,13 @@
             }
         },
         "p-map": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-            "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-            "dev": true
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
+            "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
+            "dev": true,
+            "requires": {
+                "aggregate-error": "^3.0.0"
+            }
         },
         "p-try": {
             "version": "2.2.0",
@@ -5490,20 +5682,20 @@
             "dev": true
         },
         "parallel-transform": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
-            "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+            "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
             "dev": true,
             "requires": {
-                "cyclist": "~0.2.2",
+                "cyclist": "^1.0.1",
                 "inherits": "^2.0.3",
                 "readable-stream": "^2.1.5"
             }
         },
         "parse-asn1": {
-            "version": "5.1.4",
-            "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
-            "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
+            "version": "5.1.5",
+            "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
+            "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
             "dev": true,
             "requires": {
                 "asn1.js": "^4.0.0",
@@ -5573,12 +5765,6 @@
             "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
             "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
         },
-        "path-is-inside": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-            "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-            "dev": true
-        },
         "path-key": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
@@ -5671,9 +5857,9 @@
             }
         },
         "please-upgrade-node": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz",
-            "integrity": "sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
+            "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
             "dev": true,
             "requires": {
                 "semver-compare": "^1.0.0"
@@ -5723,9 +5909,9 @@
             }
         },
         "postcss-jsx": {
-            "version": "0.36.1",
-            "resolved": "https://registry.npmjs.org/postcss-jsx/-/postcss-jsx-0.36.1.tgz",
-            "integrity": "sha512-xaZpy01YR7ijsFUtu5rViYCFHurFIPHir+faiOQp8g/NfTfWqZCKDhKrydQZ4d8WlSAmVdXGwLjpFbsNUI26Sw==",
+            "version": "0.36.3",
+            "resolved": "https://registry.npmjs.org/postcss-jsx/-/postcss-jsx-0.36.3.tgz",
+            "integrity": "sha512-yV8Ndo6KzU8eho5mCn7LoLUGPkXrRXRjhMpX4AaYJ9wLJPv099xbtpbRQ8FrPnzVxb/cuMebbPR7LweSt+hTfA==",
             "dev": true,
             "requires": {
                 "@babel/core": ">=7.2.2"
@@ -5789,9 +5975,9 @@
                     }
                 },
                 "postcss-value-parser": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz",
-                    "integrity": "sha512-ESPktioptiSUchCKgggAkzdmkgzKfmp0EU8jXH+5kbIUB+unr0Y4CY9SRMvibuvYUBjNh1ACLbxqYNpdTQOteQ==",
+                    "version": "4.0.2",
+                    "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz",
+                    "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==",
                     "dev": true
                 }
             }
@@ -5868,13 +6054,13 @@
             }
         },
         "postcss-sass": {
-            "version": "0.3.5",
-            "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.3.5.tgz",
-            "integrity": "sha512-B5z2Kob4xBxFjcufFnhQ2HqJQ2y/Zs/ic5EZbCywCkxKd756Q40cIQ/veRDwSrw1BF6+4wUgmpm0sBASqVi65A==",
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.1.tgz",
+            "integrity": "sha512-YDdykeDHylqiD2CdXuP7K1aDz7hCflGVB6H6lqabWVab5mVOWhguUuWZYpFU22/E12AEGiMlOfZnLqr343zhVA==",
             "dev": true,
             "requires": {
-                "gonzales-pe": "^4.2.3",
-                "postcss": "^7.0.1"
+                "gonzales-pe": "^4.2.4",
+                "postcss": "^7.0.14"
             }
         },
         "postcss-scss": {
@@ -5904,9 +6090,9 @@
             "dev": true
         },
         "postcss-value-parser": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-            "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz",
+            "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==",
             "dev": true
         },
         "pre-commit": {
@@ -5988,9 +6174,9 @@
             "dev": true
         },
         "psl": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/psl/-/psl-1.2.0.tgz",
-            "integrity": "sha512-GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA==",
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
+            "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
             "dev": true
         },
         "public-encrypt": {
@@ -6047,13 +6233,13 @@
             "dev": true
         },
         "puppeteer": {
-            "version": "1.18.1",
-            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.18.1.tgz",
-            "integrity": "sha512-luUy0HPSuWPsPZ1wAp6NinE0zgetWtudf5zwZ6dHjMWfYpTQcmKveFRox7VBNhQ98OjNA9PQ9PzQyX8k/KrxTg==",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-2.0.0.tgz",
+            "integrity": "sha512-t3MmTWzQxPRP71teU6l0jX47PHXlc4Z52sQv4LJQSZLq1ttkKS2yGM3gaI57uQwZkNaoGd0+HPPMELZkcyhlqA==",
             "requires": {
                 "debug": "^4.1.0",
                 "extract-zip": "^1.6.6",
-                "https-proxy-agent": "^2.2.1",
+                "https-proxy-agent": "^3.0.0",
                 "mime": "^2.0.3",
                 "progress": "^2.0.1",
                 "proxy-from-env": "^1.0.0",
@@ -6558,6 +6744,12 @@
             "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
             "dev": true
         },
+        "reusify": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+            "dev": true
+        },
         "rimraf": {
             "version": "2.6.3",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
@@ -6582,6 +6774,12 @@
             "integrity": "sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==",
             "dev": true
         },
+        "run-parallel": {
+            "version": "1.1.9",
+            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
+            "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
+            "dev": true
+        },
         "run-queue": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
@@ -6592,9 +6790,9 @@
             }
         },
         "rxjs": {
-            "version": "6.5.2",
-            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
-            "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
+            "version": "6.5.3",
+            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
+            "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
             "dev": true,
             "requires": {
                 "tslib": "^1.9.0"
@@ -6740,23 +6938,32 @@
             }
         },
         "sass-loader": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz",
-            "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.0.tgz",
+            "integrity": "sha512-+qeMu563PN7rPdit2+n5uuYVR0SSVwm0JsOUsaJXzgYcClWSlmX0iHDnmeOobPkf5kUglVot3QS6SyLyaQoJ4w==",
             "dev": true,
             "requires": {
-                "clone-deep": "^2.0.1",
-                "loader-utils": "^1.0.1",
-                "lodash.tail": "^4.1.1",
-                "neo-async": "^2.5.0",
-                "pify": "^3.0.0",
-                "semver": "^5.5.0"
+                "clone-deep": "^4.0.1",
+                "loader-utils": "^1.2.3",
+                "neo-async": "^2.6.1",
+                "schema-utils": "^2.1.0",
+                "semver": "^6.3.0"
             },
             "dependencies": {
-                "pify": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-                    "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+                "schema-utils": {
+                    "version": "2.5.0",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.5.0.tgz",
+                    "integrity": "sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==",
+                    "dev": true,
+                    "requires": {
+                        "ajv": "^6.10.2",
+                        "ajv-keywords": "^3.4.1"
+                    }
+                },
+                "semver": {
+                    "version": "6.3.0",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
                     "dev": true
                 }
             }
@@ -6806,9 +7013,9 @@
             "dev": true
         },
         "serialize-javascript": {
-            "version": "1.7.0",
-            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
-            "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==",
+            "version": "1.9.1",
+            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
+            "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==",
             "dev": true
         },
         "set-blocking": {
@@ -6857,22 +7064,12 @@
             }
         },
         "shallow-clone": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
-            "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+            "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
             "dev": true,
             "requires": {
-                "is-extendable": "^0.1.1",
-                "kind-of": "^5.0.0",
-                "mixin-object": "^2.0.1"
-            },
-            "dependencies": {
-                "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
-                }
+                "kind-of": "^6.0.2"
             }
         },
         "shebang-command": {
@@ -7065,9 +7262,9 @@
             }
         },
         "source-map-support": {
-            "version": "0.5.12",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
-            "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
+            "version": "0.5.13",
+            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+            "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
             "dev": true,
             "requires": {
                 "buffer-from": "^1.0.0",
@@ -7259,9 +7456,9 @@
             "dev": true
         },
         "string-argv": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.0.tgz",
-            "integrity": "sha512-NGZHq3nkSXVtGZXTBjFru3MNfoZyIzN25T7BmvdgnSC0LCJczAGLLMQLyjywSIaAoqSemgLzBRHOsnrHbt60+Q==",
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
+            "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
             "dev": true
         },
         "string-width": {
@@ -7354,13 +7551,25 @@
             }
         },
         "style-loader": {
-            "version": "0.23.1",
-            "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz",
-            "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.0.0.tgz",
+            "integrity": "sha512-B0dOCFwv7/eY31a5PCieNwMgMhVGFe9w+rh7s/Bx8kfFkrth9zfTZquoYvdw8URgiqxObQKcpW51Ugz1HjfdZw==",
             "dev": true,
             "requires": {
-                "loader-utils": "^1.1.0",
-                "schema-utils": "^1.0.0"
+                "loader-utils": "^1.2.3",
+                "schema-utils": "^2.0.1"
+            },
+            "dependencies": {
+                "schema-utils": {
+                    "version": "2.5.0",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.5.0.tgz",
+                    "integrity": "sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==",
+                    "dev": true,
+                    "requires": {
+                        "ajv": "^6.10.2",
+                        "ajv-keywords": "^3.4.1"
+                    }
+                }
             }
         },
         "style-search": {
@@ -7370,9 +7579,9 @@
             "dev": true
         },
         "stylelint": {
-            "version": "10.1.0",
-            "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-10.1.0.tgz",
-            "integrity": "sha512-OmlUXrgzEMLQYj1JPTpyZPR9G4bl0StidfHnGJEMpdiQ0JyTq0MPg1xkHk1/xVJ2rTPESyJCDWjG8Kbpoo7Kuw==",
+            "version": "11.1.1",
+            "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-11.1.1.tgz",
+            "integrity": "sha512-Vx6TAJsxG6qksiFvxQTKriQhp1CqUWdpTDITEkAjTR+l+8Af7qNlvrUDXfpuFJgXh/ayF8xdMSKE+SstcsPmMA==",
             "dev": true,
             "requires": {
                 "autoprefixer": "^9.5.1",
@@ -7390,29 +7599,28 @@
                 "ignore": "^5.0.6",
                 "import-lazy": "^4.0.0",
                 "imurmurhash": "^0.1.4",
-                "known-css-properties": "^0.14.0",
+                "known-css-properties": "^0.16.0",
                 "leven": "^3.1.0",
-                "lodash": "^4.17.11",
+                "lodash": "^4.17.14",
                 "log-symbols": "^3.0.0",
                 "mathml-tag-names": "^2.1.0",
                 "meow": "^5.0.0",
                 "micromatch": "^4.0.0",
                 "normalize-selector": "^0.2.0",
-                "pify": "^4.0.1",
                 "postcss": "^7.0.14",
                 "postcss-html": "^0.36.0",
-                "postcss-jsx": "^0.36.1",
+                "postcss-jsx": "^0.36.3",
                 "postcss-less": "^3.1.4",
                 "postcss-markdown": "^0.36.0",
                 "postcss-media-query-parser": "^0.2.3",
                 "postcss-reporter": "^6.0.1",
                 "postcss-resolve-nested-selector": "^0.1.1",
                 "postcss-safe-parser": "^4.0.1",
-                "postcss-sass": "^0.3.5",
+                "postcss-sass": "^0.4.1",
                 "postcss-scss": "^2.0.0",
                 "postcss-selector-parser": "^3.1.0",
                 "postcss-syntax": "^0.36.2",
-                "postcss-value-parser": "^3.3.1",
+                "postcss-value-parser": "^4.0.2",
                 "resolve-from": "^5.0.0",
                 "signal-exit": "^3.0.2",
                 "slash": "^3.0.0",
@@ -7422,7 +7630,8 @@
                 "style-search": "^0.1.0",
                 "sugarss": "^2.0.0",
                 "svg-tags": "^1.0.0",
-                "table": "^5.2.3"
+                "table": "^5.2.3",
+                "v8-compile-cache": "^2.1.0"
             },
             "dependencies": {
                 "ansi-regex": {
@@ -7674,6 +7883,12 @@
                     "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
                     "dev": true
                 },
+                "v8-compile-cache": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
+                    "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==",
+                    "dev": true
+                },
                 "yargs-parser": {
                     "version": "10.1.0",
                     "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
@@ -7685,6 +7900,21 @@
                 }
             }
         },
+        "stylelint-config-recommended": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz",
+            "integrity": "sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==",
+            "dev": true
+        },
+        "stylelint-config-standard": {
+            "version": "19.0.0",
+            "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-19.0.0.tgz",
+            "integrity": "sha512-VvcODsL1PryzpYteWZo2YaA5vU/pWfjqBpOvmeA8iB2MteZ/ZhI1O4hnrWMidsS4vmEJpKtjdhLdfGJmmZm6Cg==",
+            "dev": true,
+            "requires": {
+                "stylelint-config-recommended": "^3.0.0"
+            }
+        },
         "sugarss": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz",
@@ -7716,9 +7946,9 @@
             "dev": true
         },
         "table": {
-            "version": "5.4.4",
-            "resolved": "https://registry.npmjs.org/table/-/table-5.4.4.tgz",
-            "integrity": "sha512-IIfEAUx5QlODLblLrGTTLJA7Tk0iLSGBvgY8essPRVNGHAzThujww1YqHLs6h3HfTg55h++RzLHH5Xw/rfv+mg==",
+            "version": "5.4.6",
+            "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+            "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
             "dev": true,
             "requires": {
                 "ajv": "^6.10.2",
@@ -7790,9 +8020,9 @@
             }
         },
         "terser": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-4.1.2.tgz",
-            "integrity": "sha512-jvNoEQSPXJdssFwqPSgWjsOrb+ELoE+ILpHPKXC83tIxOlh2U75F1KuB2luLD/3a6/7K3Vw5pDn+hvu0C4AzSw==",
+            "version": "4.3.9",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.9.tgz",
+            "integrity": "sha512-NFGMpHjlzmyOtPL+fDw3G7+6Ueh/sz4mkaUYa4lJCxOPTNzd0Uj0aZJOmsDYoSQyfuVoWDMSWTPU3huyOm2zdA==",
             "dev": true,
             "requires": {
                 "commander": "^2.20.0",
@@ -7809,20 +8039,19 @@
             }
         },
         "terser-webpack-plugin": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz",
-            "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==",
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz",
+            "integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==",
             "dev": true,
             "requires": {
-                "cacache": "^11.3.2",
-                "find-cache-dir": "^2.0.0",
+                "cacache": "^12.0.2",
+                "find-cache-dir": "^2.1.0",
                 "is-wsl": "^1.1.0",
-                "loader-utils": "^1.2.3",
                 "schema-utils": "^1.0.0",
                 "serialize-javascript": "^1.7.0",
                 "source-map": "^0.6.1",
-                "terser": "^4.0.0",
-                "webpack-sources": "^1.3.0",
+                "terser": "^4.1.2",
+                "webpack-sources": "^1.4.0",
                 "worker-farm": "^1.7.0"
             },
             "dependencies": {
@@ -7831,6 +8060,16 @@
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
+                },
+                "webpack-sources": {
+                    "version": "1.4.3",
+                    "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+                    "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+                    "dev": true,
+                    "requires": {
+                        "source-list-map": "^2.0.0",
+                        "source-map": "~0.6.1"
+                    }
                 }
             }
         },
@@ -7845,9 +8084,9 @@
             }
         },
         "timers-browserify": {
-            "version": "2.0.10",
-            "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
-            "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
+            "version": "2.0.11",
+            "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+            "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
             "dev": true,
             "requires": {
                 "setimmediate": "^1.0.4"
@@ -7936,12 +8175,6 @@
             "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
             "dev": true
         },
-        "trim-right": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-            "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-            "dev": true
-        },
         "trim-trailing-lines": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz",
@@ -8152,9 +8385,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==",
             "dev": true
         },
         "uri-js": {
@@ -8219,9 +8452,9 @@
             "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
         },
         "uuid": {
-            "version": "3.3.2",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-            "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
+            "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
             "dev": true
         },
         "v8-compile-cache": {
@@ -8264,9 +8497,9 @@
             },
             "dependencies": {
                 "is-buffer": {
-                    "version": "2.0.3",
-                    "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
-                    "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==",
+                    "version": "2.0.4",
+                    "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
+                    "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
                     "dev": true
                 }
             }
@@ -8304,34 +8537,34 @@
             }
         },
         "webpack": {
-            "version": "4.36.1",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.36.1.tgz",
-            "integrity": "sha512-Ej01/N9W8DVyhEpeQnbUdGvOECw0L46FxS12cCOs8gSK7bhUlrbHRnWkjiXckGlHjUrmL89kDpTRIkUk6Y+fKg==",
+            "version": "4.41.2",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.2.tgz",
+            "integrity": "sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==",
             "dev": true,
             "requires": {
                 "@webassemblyjs/ast": "1.8.5",
                 "@webassemblyjs/helper-module-context": "1.8.5",
                 "@webassemblyjs/wasm-edit": "1.8.5",
                 "@webassemblyjs/wasm-parser": "1.8.5",
-                "acorn": "^6.2.0",
-                "ajv": "^6.1.0",
-                "ajv-keywords": "^3.1.0",
-                "chrome-trace-event": "^1.0.0",
+                "acorn": "^6.2.1",
+                "ajv": "^6.10.2",
+                "ajv-keywords": "^3.4.1",
+                "chrome-trace-event": "^1.0.2",
                 "enhanced-resolve": "^4.1.0",
-                "eslint-scope": "^4.0.0",
+                "eslint-scope": "^4.0.3",
                 "json-parse-better-errors": "^1.0.2",
-                "loader-runner": "^2.3.0",
-                "loader-utils": "^1.1.0",
-                "memory-fs": "~0.4.1",
-                "micromatch": "^3.1.8",
-                "mkdirp": "~0.5.0",
-                "neo-async": "^2.5.0",
-                "node-libs-browser": "^2.0.0",
+                "loader-runner": "^2.4.0",
+                "loader-utils": "^1.2.3",
+                "memory-fs": "^0.4.1",
+                "micromatch": "^3.1.10",
+                "mkdirp": "^0.5.1",
+                "neo-async": "^2.6.1",
+                "node-libs-browser": "^2.2.1",
                 "schema-utils": "^1.0.0",
-                "tapable": "^1.1.0",
-                "terser-webpack-plugin": "^1.1.0",
-                "watchpack": "^1.5.0",
-                "webpack-sources": "^1.3.0"
+                "tapable": "^1.1.3",
+                "terser-webpack-plugin": "^1.4.1",
+                "watchpack": "^1.6.0",
+                "webpack-sources": "^1.4.1"
             },
             "dependencies": {
                 "braces": {
@@ -8427,6 +8660,12 @@
                         "to-regex": "^3.0.2"
                     }
                 },
+                "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
+                },
                 "to-regex-range": {
                     "version": "2.1.1",
                     "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
@@ -8436,13 +8675,23 @@
                         "is-number": "^3.0.0",
                         "repeat-string": "^1.6.1"
                     }
+                },
+                "webpack-sources": {
+                    "version": "1.4.3",
+                    "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+                    "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+                    "dev": true,
+                    "requires": {
+                        "source-list-map": "^2.0.0",
+                        "source-map": "~0.6.1"
+                    }
                 }
             }
         },
         "webpack-cli": {
-            "version": "3.3.6",
-            "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.6.tgz",
-            "integrity": "sha512-0vEa83M7kJtxK/jUhlpZ27WHIOndz5mghWL2O53kiDoA9DIxSKnfqB92LoqEn77cT4f3H2cZm1BMEat/6AZz3A==",
+            "version": "3.3.9",
+            "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz",
+            "integrity": "sha512-xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A==",
             "dev": true,
             "requires": {
                 "chalk": "2.4.2",
@@ -8458,6 +8707,17 @@
                 "yargs": "13.2.4"
             },
             "dependencies": {
+                "enhanced-resolve": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
+                    "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
+                    "dev": true,
+                    "requires": {
+                        "graceful-fs": "^4.1.2",
+                        "memory-fs": "^0.4.0",
+                        "tapable": "^1.0.0"
+                    }
+                },
                 "supports-color": {
                     "version": "6.1.0",
                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
diff --git a/package.json b/package.json
index 53deb5a1..8dc98cdc 100644
--- a/package.json
+++ b/package.json
@@ -6,20 +6,21 @@
     "license": "CC0-1.0",
     "dependencies": {
         "normalize.css": "^8.0.1",
-        "puppeteer": "^1.18.1"
+        "puppeteer": "^2.0.0"
     },
     "devDependencies": {
-        "css-loader": "^3.1.0",
-        "husky": "^3.0.0",
-        "lint-staged": "^9.2.0",
+        "css-loader": "^3.2.0",
+        "husky": "^3.0.9",
+        "lint-staged": "^9.4.2",
         "mini-css-extract-plugin": "^0.8.0",
-        "node-sass": "^4.12.0",
+        "node-sass": "^4.13.0",
         "pre-commit": "^1.1.3",
-        "sass-loader": "^7.1.0",
-        "style-loader": "^0.23.1",
-        "stylelint": "^10.1.0",
-        "webpack": "^4.36.1",
-        "webpack-cli": "^3.3.6"
+        "sass-loader": "^8.0.0",
+        "style-loader": "^1.0.0",
+        "stylelint": "^11.1.1",
+        "stylelint-config-standard": "^19.0.0",
+        "webpack": "^4.41.2",
+        "webpack-cli": "^3.3.9"
     },
     "scripts": {
         "compress": "scripts/compress",
diff --git a/phpunit.xml b/phpunit.xml
index 32202bc9..fe5312bd 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -7,8 +7,8 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
-         printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer">
+         stopOnFailure="true"
+>
     <testsuites>
         <testsuite name="Unit">
             <directory suffix="Test.php">./tests/Unit</directory>
diff --git a/public/assets/app.css b/public/assets/app.css
index 38d2818f..f21cbc36 100644
--- a/public/assets/app.css
+++ b/public/assets/app.css
@@ -1,5 +1,76 @@
+:root {
+  --font-stack-body: montserrat, sans-serif;
+  --font-stack-headings: bebas-neue, sans-serif; }
+
 body {
-  font-family: "Comic Sans MS", cursive; }
+  font-family: var(--font-stack-body);
+  font-size: 2rem; }
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-family: var(--font-stack-headings); }
+
+body {
+  display: flex;
+  flex-direction: column; }
+
+#top-header {
+  display: flex;
+  flex-direction: column;
+  justify-content: center; }
+  #top-header h1 {
+    display: flex;
+    justify-content: center; }
+  #top-header nav {
+    display: flex;
+    justify-content: center; }
+    #top-header nav a {
+      margin: 0 0.5rem; }
+
+.h-feed {
+  display: flex;
+  flex-direction: column;
+  margin: auto; }
+  @media screen and (min-width: 700px) {
+    .h-feed {
+      max-width: 700px; }
+      .h-feed > .note,
+      .h-feed > .h-entry {
+        padding: 0 1rem; } }
+
+.note {
+  display: flex;
+  flex-direction: column; }
+  .note .note-metadata {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between; }
+    .note .note-metadata .syndication-links svg {
+      height: 1em;
+      width: 1em; }
+
+.personal-bio {
+  padding: 0 2rem; }
+
+footer {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-top: 1.5rem; }
+
+.post-info a {
+  text-decoration: none; }
+
+.syndication-links .u-syndication {
+  text-decoration: none; }
+
+.p-bridgy-facebook-content,
+.p-bridgy-twitter-content {
+  display: none; }
 
 
 /*# sourceMappingURL=app.css.map*/
\ No newline at end of file
diff --git a/public/assets/app.css.map b/public/assets/app.css.map
index 08996fde..100c88b4 100644
--- a/public/assets/app.css.map
+++ b/public/assets/app.css.map
@@ -1 +1 @@
-{"version":3,"sources":["webpack:///./resources/sass/app.scss"],"names":[],"mappings":"AAAA;EACI,qCAAqC","file":"app.css","sourcesContent":["body {\n    font-family: \"Comic Sans MS\", cursive;\n}\n"],"sourceRoot":""}
\ No newline at end of file
+{"version":3,"sources":["webpack:///./resources/sass/_variables.scss","webpack:///./resources/sass/_base.scss","webpack:///./resources/sass/_layout-main.scss","webpack:///./resources/sass/_link-styles.scss","webpack:///./resources/sass/_posse.scss"],"names":[],"mappings":"AAAA;EACI,yCAAkB;EAClB,6CAAsB;;ACF1B;EACI,mCAAmC;EACnC,eAAe;;AAGnB;;;;;;EAMI,uCAAuC;;ACX3C;EACI,aAAa;EACb,sBAAsB;;AAG1B;EACI,aAAa;EACb,sBAAsB;EACtB,uBAAuB;EAH3B;IAMQ,aAAa;IACb,uBAAuB;EAP/B;IAWQ,aAAa;IACb,uBAAuB;IAZ/B;MAeY,gBAAgB;;AAK5B;EACI,aAAa;EACb,sBAAsB;EACtB,YAAY;EAEZ;IALJ;MAMQ,gBAAgB;MANxB;;QAUY,eAAe,IAClB;;AAIT;EACI,aAAa;EACb,sBAAsB;EAF1B;IAKQ,aAAa;IACb,mBAAmB;IACnB,8BAA8B;IAPtC;MAWgB,WAAW;MACX,UAAU;;AAM1B;EACI,eAAe;;AAGnB;EACI,aAAa;EACb,sBAAsB;EACtB,mBAAmB;EACnB,kBAAkB;;AClEtB;EAEQ,qBAAqB;;AAI7B;EAEQ,qBAAqB;;ACR7B;;EAEI,aAAa","file":"app.css","sourcesContent":[":root {\n    --font-stack-body: montserrat, sans-serif;\n    --font-stack-headings: bebas-neue, sans-serif;\n}\n","body {\n    font-family: var(--font-stack-body);\n    font-size: 2rem;\n}\n\nh1,\nh2,\nh3,\nh4,\nh5,\nh6 {\n    font-family: var(--font-stack-headings);\n}\n","body {\n    display: flex;\n    flex-direction: column;\n}\n\n#top-header {\n    display: flex;\n    flex-direction: column;\n    justify-content: center;\n\n    h1 {\n        display: flex;\n        justify-content: center;\n    }\n\n    nav {\n        display: flex;\n        justify-content: center;\n\n        a {\n            margin: 0 0.5rem;\n        }\n    }\n}\n\n.h-feed {\n    display: flex;\n    flex-direction: column;\n    margin: auto;\n\n    @media screen and (min-width: 700px) {\n        max-width: 700px;\n\n        > .note,\n        > .h-entry {\n            padding: 0 1rem;\n        }\n    }\n}\n\n.note {\n    display: flex;\n    flex-direction: column;\n\n    .note-metadata {\n        display: flex;\n        flex-direction: row;\n        justify-content: space-between;\n\n        .syndication-links {\n            svg {\n                height: 1em;\n                width: 1em;\n            }\n        }\n    }\n}\n\n.personal-bio {\n    padding: 0 2rem;\n}\n\nfooter {\n    display: flex;\n    flex-direction: column;\n    align-items: center;\n    margin-top: 1.5rem;\n}\n",".post-info {\n    a {\n        text-decoration: none;\n    }\n}\n\n.syndication-links {\n    .u-syndication {\n        text-decoration: none;\n    }\n}\n",".p-bridgy-facebook-content,\n.p-bridgy-twitter-content {\n    display: none;\n}\n"],"sourceRoot":""}
\ No newline at end of file
diff --git a/public/assets/main.js.map b/public/assets/main.js.map
index 6b493610..ae037950 100644
--- a/public/assets/main.js.map
+++ b/public/assets/main.js.map
@@ -1 +1 @@
-{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./resources/sass/app.scss?af33"],"names":[],"mappings":";AAAA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;;AAGA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA,kDAA0C,gCAAgC;AAC1E;AACA;;AAEA;AACA;AACA;AACA,gEAAwD,kBAAkB;AAC1E;AACA,yDAAiD,cAAc;AAC/D;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iDAAyC,iCAAiC;AAC1E,wHAAgH,mBAAmB,EAAE;AACrI;AACA;;AAEA;AACA;AACA;AACA,mCAA2B,0BAA0B,EAAE;AACvD,yCAAiC,eAAe;AAChD;AACA;AACA;;AAEA;AACA,8DAAsD,+DAA+D;;AAErH;AACA;;;AAGA;AACA;;;;;;;;;;;;AClFA,uC","file":"main.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 0);\n","// extracted by mini-css-extract-plugin"],"sourceRoot":""}
\ No newline at end of file
+{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./resources/sass/app.scss"],"names":[],"mappings":";QAAA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;;QAEA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;;;QAGA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA,0CAA0C,gCAAgC;QAC1E;QACA;;QAEA;QACA;QACA;QACA,wDAAwD,kBAAkB;QAC1E;QACA,iDAAiD,cAAc;QAC/D;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA,yCAAyC,iCAAiC;QAC1E,gHAAgH,mBAAmB,EAAE;QACrI;QACA;;QAEA;QACA;QACA;QACA,2BAA2B,0BAA0B,EAAE;QACvD,iCAAiC,eAAe;QAChD;QACA;QACA;;QAEA;QACA,sDAAsD,+DAA+D;;QAErH;QACA;;;QAGA;QACA;;;;;;;;;;;;AClFA,uC","file":"main.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 0);\n","// extracted by mini-css-extract-plugin"],"sourceRoot":""}
\ No newline at end of file
diff --git a/resources/sass/_base.scss b/resources/sass/_base.scss
new file mode 100644
index 00000000..a645f0d1
--- /dev/null
+++ b/resources/sass/_base.scss
@@ -0,0 +1,13 @@
+body {
+    font-family: var(--font-stack-body);
+    font-size: 2rem;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+    font-family: var(--font-stack-headings);
+}
diff --git a/resources/sass/_layout-main.scss b/resources/sass/_layout-main.scss
new file mode 100644
index 00000000..934ef13c
--- /dev/null
+++ b/resources/sass/_layout-main.scss
@@ -0,0 +1,68 @@
+body {
+    display: flex;
+    flex-direction: column;
+}
+
+#top-header {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+
+    h1 {
+        display: flex;
+        justify-content: center;
+    }
+
+    nav {
+        display: flex;
+        justify-content: center;
+
+        a {
+            margin: 0 0.5rem;
+        }
+    }
+}
+
+.h-feed {
+    display: flex;
+    flex-direction: column;
+    margin: auto;
+
+    @media screen and (min-width: 700px) {
+        max-width: 700px;
+
+        > .note,
+        > .h-entry {
+            padding: 0 1rem;
+        }
+    }
+}
+
+.note {
+    display: flex;
+    flex-direction: column;
+
+    .note-metadata {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+
+        .syndication-links {
+            svg {
+                height: 1em;
+                width: 1em;
+            }
+        }
+    }
+}
+
+.personal-bio {
+    padding: 0 2rem;
+}
+
+footer {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin-top: 1.5rem;
+}
diff --git a/resources/sass/_link-styles.scss b/resources/sass/_link-styles.scss
new file mode 100644
index 00000000..b7018a28
--- /dev/null
+++ b/resources/sass/_link-styles.scss
@@ -0,0 +1,11 @@
+.post-info {
+    a {
+        text-decoration: none;
+    }
+}
+
+.syndication-links {
+    .u-syndication {
+        text-decoration: none;
+    }
+}
diff --git a/resources/sass/_posse.scss b/resources/sass/_posse.scss
new file mode 100644
index 00000000..922b04bd
--- /dev/null
+++ b/resources/sass/_posse.scss
@@ -0,0 +1,4 @@
+.p-bridgy-facebook-content,
+.p-bridgy-twitter-content {
+    display: none;
+}
diff --git a/resources/sass/_variables.scss b/resources/sass/_variables.scss
new file mode 100644
index 00000000..7e8a39b6
--- /dev/null
+++ b/resources/sass/_variables.scss
@@ -0,0 +1,4 @@
+:root {
+    --font-stack-body: montserrat, sans-serif;
+    --font-stack-headings: bebas-neue, sans-serif;
+}
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index 6ab51078..283e72fa 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -1,3 +1,5 @@
-body {
-    font-family: "Comic Sans MS", cursive;
-}
+@import "variables";
+@import "base";
+@import "layout-main";
+@import "link-styles";
+@import "posse";
diff --git a/resources/views/admin/articles/create.blade.php b/resources/views/admin/articles/create.blade.php
index f140666c..d40d3541 100644
--- a/resources/views/admin/articles/create.blade.php
+++ b/resources/views/admin/articles/create.blade.php
@@ -3,28 +3,30 @@
 @section('title')New Article « Admin CP « @stop
 
 @section('content')
-@if(isset($message))            <p class="error">{{ $message }}</p>@endif
-            <form action="/admin/blog/" method="post" accept-charset="utf-8" enctype="multipart/form-data" class="admin-form form">
-                {{ csrf_field() }}
-                <div>
-                    <label for="title">Title (URL):</label>
-                    <input type="text" name="title" id="title" value="{{ old('title') }}" placeholder="Title here">
-                    <input type="text" name="url" id="url" value="{{ old('url') }}" placeholder="Article URL">
-                </div>
-                <div>
-                    <label for="main">Main:</label>
-                    <textarea name="main" id="main" placeholder="Article here">{{ old('main') }}</textarea>
-                </div>
-                <div class="form-row">
-                    <label for="published">Published:</label>
-                    <input type="checkbox" name="published" id="published" value="1">
-                </div>
-                <p>Or you can upload an <code>.md</code> file:</p>
-                <div>
-                    <input type="file" accept=".md" name="article">
-                </div>
-                <div>
-                    <button type="submit" name="save">Save</button>
-                </div>
-            </form>
+    @if(isset($message))
+        <p class="error">{{ $message }}</p>
+    @endif
+    <form action="/admin/blog/" method="post" accept-charset="utf-8" enctype="multipart/form-data" class="admin-form form">
+        {{ csrf_field() }}
+        <div>
+            <label for="title">Title (URL):</label>
+            <input type="text" name="title" id="title" value="{{ old('title') }}" placeholder="Title here">
+            <input type="text" name="url" id="url" value="{{ old('url') }}" placeholder="Article URL">
+        </div>
+        <div>
+            <label for="main">Main:</label>
+            <textarea name="main" id="main" placeholder="Article here">{{ old('main') }}</textarea>
+        </div>
+        <div class="form-row">
+            <label for="published">Published:</label>
+            <input type="checkbox" name="published" id="published" value="1">
+        </div>
+        <p>Or you can upload an <code>.md</code> file:</p>
+        <div>
+            <input type="file" accept=".md" name="article">
+        </div>
+        <div>
+            <button type="submit" name="save">Save</button>
+        </div>
+    </form>
 @stop
diff --git a/resources/views/admin/articles/edit.blade.php b/resources/views/admin/articles/edit.blade.php
index 43072826..d5c5dba5 100644
--- a/resources/views/admin/articles/edit.blade.php
+++ b/resources/views/admin/articles/edit.blade.php
@@ -3,32 +3,32 @@
 @section('title')Edit Article « Admin CP « @stop
 
 @section('content')
-            <form action="/admin/blog/{{ $id }}" method="post" accept-charset="utf-8" class="admin-form form">
-                {{ csrf_field() }}
-                {{ method_field('PUT') }}
-                <div>
-                    <label for="title">Title (URL):</label>
-                    <input type="text" name="title" id="title" value="{!! $post['0']['title'] !!}">
-                    <input type="url" name="url" id="url" value="{!! $post['0']['url'] !!}">
-                </div>
-                <div>
-                    <label for="main">Main:</label>
-                    <textarea name="main" id="main">{{ $post['0']['main'] }}</textarea>
-                </div>
-                <div class="form-row">
-                    <label for="published">Published:</label>
-                    <input type="checkbox" name="published" value="1"@if($post['0']['published'] == '1') checked="checked"@endif>
-                </div>
-                <div>
-                    <button type="submit" name="save">Save</button>
-                </div>
-            </form>
-            <hr>
-            <form action="/admin/blog/{{ $id }}" method="post" class="admin-form form">
-                {{ csrf_field() }}
-                {{ method_field('DELETE') }}
-                <div>
-                    <button type="submit" name="delete">Delete</button>
-                </div>
-            </form>
+    <form action="/admin/blog/{{ $id }}" method="post" accept-charset="utf-8" class="admin-form form">
+        {{ csrf_field() }}
+        {{ method_field('PUT') }}
+        <div>
+            <label for="title">Title (URL):</label>
+            <input type="text" name="title" id="title" value="{!! $post['0']['title'] !!}">
+            <input type="url" name="url" id="url" value="{!! $post['0']['url'] !!}">
+        </div>
+        <div>
+            <label for="main">Main:</label>
+            <textarea name="main" id="main">{{ $post['0']['main'] }}</textarea>
+        </div>
+        <div class="form-row">
+            <label for="published">Published:</label>
+            <input type="checkbox" name="published" value="1"@if($post['0']['published'] == '1') checked="checked"@endif>
+        </div>
+        <div>
+            <button type="submit" name="save">Save</button>
+        </div>
+    </form>
+    <hr>
+    <form action="/admin/blog/{{ $id }}" method="post" class="admin-form form">
+        {{ csrf_field() }}
+        {{ method_field('DELETE') }}
+        <div>
+            <button type="submit" name="delete">Delete</button>
+        </div>
+    </form>
 @stop
diff --git a/resources/views/admin/articles/index.blade.php b/resources/views/admin/articles/index.blade.php
index 1f9f9e3c..c3d01e1c 100644
--- a/resources/views/admin/articles/index.blade.php
+++ b/resources/views/admin/articles/index.blade.php
@@ -3,10 +3,13 @@
 @section('title')List Articles « Admin CP « @stop
 
 @section('content')
-            <p>Select article to edit:</p>
-            <ol reversed>
-@foreach($posts as $post)
-                <li><a href="/admin/blog/{{ $post['id'] }}/edit">{{ $post['title'] }}</a>@if($post['published'] == '0')<span class="notpublished">not published</span>@endif
-@endforeach
-            </ol>
+    <p>Select article to edit:</p>
+    <ol reversed>
+    @foreach($posts as $post)
+        <li>
+            <a href="/admin/blog/{{ $post['id'] }}/edit">{{ $post['title'] }}</a>
+            @if($post['published'] == '0')<span class="notpublished">not published</span>@endif
+        </li>
+    @endforeach
+    </ol>
 @stop
diff --git a/resources/views/admin/clients/create.blade.php b/resources/views/admin/clients/create.blade.php
index 7d1feff6..82933047 100644
--- a/resources/views/admin/clients/create.blade.php
+++ b/resources/views/admin/clients/create.blade.php
@@ -3,19 +3,19 @@
 @section('title')New Client « Admin CP « @stop
 
 @section('content')
-            <h1>New Client</h1>
-            <form action="/admin/clients/" method="post" accept-charset="utf-8" class="admin-form form">
-                {{ csrf_field() }}
-                <div>
-                    <label for="client_url">Client URL:</label>
-                    <input type="text" name="client_url" id="client_url" placeholder="client_url">
-                </div>
-                <div>
-                    <label for="client_name">Client Name:</label>
-                    <input type="text" name="client_name" id="client_name" placeholder="client_name">
-                </div>
-                <div>
-                    <button type="submit" name="submit">Submit</button>
-                </div>
-            </form>
+    <h1>New Client</h1>
+    <form action="/admin/clients/" method="post" accept-charset="utf-8" class="admin-form form">
+        {{ csrf_field() }}
+        <div>
+            <label for="client_url">Client URL:</label>
+            <input type="text" name="client_url" id="client_url" placeholder="client_url">
+        </div>
+        <div>
+            <label for="client_name">Client Name:</label>
+            <input type="text" name="client_name" id="client_name" placeholder="client_name">
+        </div>
+        <div>
+            <button type="submit" name="submit">Submit</button>
+        </div>
+    </form>
 @stop
diff --git a/resources/views/admin/clients/edit.blade.php b/resources/views/admin/clients/edit.blade.php
index 8c2b0835..30b8c6fb 100644
--- a/resources/views/admin/clients/edit.blade.php
+++ b/resources/views/admin/clients/edit.blade.php
@@ -3,26 +3,26 @@
 @section('title')Edit Client « Admin CP « @stop
 
 @section('content')
-            <h1>Edit Client</h1>
-            <form action="/admin/clients/{{ $id }}" method="post" accept-charset="utf-8" class="admin-form form">
-                {{ csrf_field() }}
-                {{ method_field('PUT') }}
-                <div>
-                    <label for="client_url">Client URL:</label>
-                    <input type="text" name="client_url" id="client_url" value="{{ $client_url }}">
-                </div>
-                <div>
-                    <label for="client_name">Client Name:</label>
-                    <input type="text" name="client_name" id="client_name" value="{{ $client_name }}">
-                </div>
-                <div>
-                    <button type="submit" name="edit">Edit</button>
-                </div>
-            </form>
-            <hr>
-            <form action="/admin/clients/{{ $id }}" method="post">
-                {{ csrf_field() }}
-                {{ method_field('DELETE') }}
-                <button type="submit" name="delete">Delete Client</button>
-            </form>
+    <h1>Edit Client</h1>
+    <form action="/admin/clients/{{ $id }}" method="post" accept-charset="utf-8" class="admin-form form">
+        {{ csrf_field() }}
+        {{ method_field('PUT') }}
+        <div>
+            <label for="client_url">Client URL:</label>
+            <input type="text" name="client_url" id="client_url" value="{{ $client_url }}">
+        </div>
+        <div>
+            <label for="client_name">Client Name:</label>
+            <input type="text" name="client_name" id="client_name" value="{{ $client_name }}">
+        </div>
+        <div>
+            <button type="submit" name="edit">Edit</button>
+        </div>
+    </form>
+    <hr>
+    <form action="/admin/clients/{{ $id }}" method="post">
+        {{ csrf_field() }}
+        {{ method_field('DELETE') }}
+        <button type="submit" name="delete">Delete Client</button>
+    </form>
 @stop
diff --git a/resources/views/admin/clients/index.blade.php b/resources/views/admin/clients/index.blade.php
index 781e20a5..df731b5c 100644
--- a/resources/views/admin/clients/index.blade.php
+++ b/resources/views/admin/clients/index.blade.php
@@ -3,13 +3,16 @@
 @section('title')List Clients « Admin CP « @stop
 
 @section('content')
-            <h1>Clients</h1>
-            <ul>
-@foreach($clients as $client)
-                <li>{{ $client['client_url'] }} : {{ $client['client_name'] }}
-                    <a href="/admin/clients/{{ $client['id'] }}/edit">edit?</a>
-                </li>
-@endforeach
-            </ul>
-            <p>Create a <a href="/admin/clients/new">new entry</a>?</p>
+    <h1>Clients</h1>
+    <ul>
+    @foreach($clients as $client)
+        <li>
+            {{ $client['client_url'] }} : {{ $client['client_name'] }}
+            <a href="/admin/clients/{{ $client['id'] }}/edit">edit?</a>
+        </li>
+    @endforeach
+    </ul>
+    <p>
+        Create a <a href="/admin/clients/new">new entry</a>?
+    </p>
 @stop
diff --git a/resources/views/admin/contacts/create.blade.php b/resources/views/admin/contacts/create.blade.php
index 36f8665d..9901af0c 100644
--- a/resources/views/admin/contacts/create.blade.php
+++ b/resources/views/admin/contacts/create.blade.php
@@ -3,27 +3,27 @@
 @section('title')New Contact « Admin CP « @stop
 
 @section('content')
-            <h1>New Contact</h1>
-            <form action="/admin/contacts/" method="post" accept-charset="utf-8" class="admin-form form">
-                {{ csrf_field() }}
-                <div>
-                    <label for="name">Real Name:</label>
-                    <input type="text" name="name" id="name" placeholder="Real Name">
-                </div>
-                <div>
-                    <label for="nick">Nick:</label>
-                    <input type="text" name="nick" id="nick" placeholder="local_nick">
-                </div>
-                <div>
-                    <label for="homepage">Homepage:</label>
-                    <input type="text" name="homepage" id="homepage" placeholder="https://homepage.com">
-                </div>
-                <div>
-                    <label for="twitter">Twitter Nick:</label>
-                    <input type="text" name="twitter" id="twitter" placeholder="Twitter handle">
-                </div>
-                <div>
-                    <button type="submit" name="submit">Submit</button>
-                </div>
-            </form>
+    <h1>New Contact</h1>
+    <form action="/admin/contacts/" method="post" accept-charset="utf-8" class="admin-form form">
+        {{ csrf_field() }}
+        <div>
+            <label for="name">Real Name:</label>
+            <input type="text" name="name" id="name" placeholder="Real Name">
+        </div>
+        <div>
+            <label for="nick">Nick:</label>
+            <input type="text" name="nick" id="nick" placeholder="local_nick">
+        </div>
+        <div>
+            <label for="homepage">Homepage:</label>
+            <input type="text" name="homepage" id="homepage" placeholder="https://homepage.com">
+        </div>
+        <div>
+            <label for="twitter">Twitter Nick:</label>
+            <input type="text" name="twitter" id="twitter" placeholder="Twitter handle">
+        </div>
+        <div>
+            <button type="submit" name="submit">Submit</button>
+        </div>
+    </form>
 @stop
diff --git a/resources/views/admin/contacts/edit.blade.php b/resources/views/admin/contacts/edit.blade.php
index c74ef4f9..d4f5ec62 100644
--- a/resources/views/admin/contacts/edit.blade.php
+++ b/resources/views/admin/contacts/edit.blade.php
@@ -3,37 +3,42 @@
 @section('title')Edit Contact « Admin CP « @stop
 
 @section('content')
-            <h1>Edit Contact</h1>
-            <form action="/admin/contacts/{{ $contact->id }}" method="post" enctype="multipart/form-data" accept-charset="utf-8" class="admin-form form">
-                {{ csrf_field() }}
-                {{ method_field('PUT') }}
-                <div>
-                    <label for="name">Real Name:</label>
-                    <input type="text" name="name" id="name" placeholder="Real Name" value="{{ $contact->name }}">
-                </div>
-                <div>
-                    <label for="nick">Nick:</label>
-                    <input type="text" name="nick" id="nick" placeholder="local_nick" value="{{ $contact->nick }}">
-                </div>
-                <div>
-                    <label for="homepage">Website:</label>
-                    <input type="text" name="homepage" id="homepage" placeholder="https://homepage.com" value="{{ $contact->homepage }}">
-                </div>
-                <div>
-                    <label for="twitter">Twitter Nick:</label>
-                    <input type="text" name="twitter" id="twitter" placeholder="Twitter handle" value="{{ $contact->twitter }}">
-                </div>
-                <div>
-                    <label for="facebook">Facebook Profile ID:</label>
-                    <input type="text" name="facebook" id="facebook" placeholder="Facebook ID" value="{{ $contact->facebook }}">
-                </div>
-                <div>
-                    <label for="avatar">Avatar:</label>
-                    <input type="file" accept="image/*" value="Upload" name="avatar" id="avatar">
-                </div>
-                <div>
-                    <button type="submit" name="submit">Submit</button>
-                </div>
-            </form>
-            <p>Instead of uploading an image, you can <a href="/admin/contacts/edit/{{ $contact->id }}/getavatar">grab from their homepage</a>?</p>
+    <h1>Edit Contact</h1>
+    <form action="/admin/contacts/{{ $contact->id }}" method="post" enctype="multipart/form-data" accept-charset="utf-8" class="admin-form form">
+        {{ csrf_field() }}
+        {{ method_field('PUT') }}
+        <div>
+            <label for="name">Real Name:</label>
+            <input type="text" name="name" id="name" placeholder="Real Name" value="{{ $contact->name }}">
+        </div>
+        <div>
+            <label for="nick">Nick:</label>
+            <input type="text" name="nick" id="nick" placeholder="local_nick" value="{{ $contact->nick }}">
+        </div>
+        <div>
+            <label for="homepage">Website:</label>
+            <input type="text" name="homepage" id="homepage" placeholder="https://homepage.com" value="{{ $contact->homepage }}">
+        </div>
+        <div>
+            <label for="twitter">Twitter Nick:</label>
+            <input type="text" name="twitter" id="twitter" placeholder="Twitter handle" value="{{ $contact->twitter }}">
+        </div>
+        <div>
+            <label for="facebook">Facebook Profile ID:</label>
+            <input type="text" name="facebook" id="facebook" placeholder="Facebook ID" value="{{ $contact->facebook }}">
+        </div>
+        <div>
+            <label for="avatar">Avatar:</label>
+            <input type="file" accept="image/*" value="Upload" name="avatar" id="avatar">
+        </div>
+        <div>
+            <button type="submit" name="submit">Submit</button>
+        </div>
+    </form>
+    <p>
+        Instead of uploading an image, you can
+        <a href="/admin/contacts/edit/{{ $contact->id }}/getavatar">
+            grab from their homepage
+        </a>?
+    </p>
 @stop
diff --git a/resources/views/admin/contacts/getavatarsuccess.blade.php b/resources/views/admin/contacts/getavatarsuccess.blade.php
index 9f5d19ad..963ffd1e 100644
--- a/resources/views/admin/contacts/getavatarsuccess.blade.php
+++ b/resources/views/admin/contacts/getavatarsuccess.blade.php
@@ -5,6 +5,6 @@ New Contact Avatar « Admin CP
 @stop
 
 @section('content')
-            <p>Successfully saved the avatar contact</p>
-            <img src="/assets/profile-images/{{ $homepage }}/image">
+    <p>Successfully saved the avatar contact</p>
+    <img src="/assets/profile-images/{{ $homepage }}/image">
 @stop
diff --git a/resources/views/admin/contacts/index.blade.php b/resources/views/admin/contacts/index.blade.php
index 4deb7128..79d8d8c5 100644
--- a/resources/views/admin/contacts/index.blade.php
+++ b/resources/views/admin/contacts/index.blade.php
@@ -3,25 +3,25 @@
 @section('title')List Contacts « Admin CP « @stop
 
 @section('content')
-            <h1>Contacts</h1>
-            <table>
-                <tr>
-                    <th>Real Name</th>
-                    <th>Nick</th>
-                    <th>Homepage</th>
-                    <th>Twitter</th>
-                    <th>Facebook</th>
-                    <th></th>
-                </tr>
-@foreach($contacts as $contact)
-                <tr>
-                    <td>{{ $contact->name }}</td>
-                    <td>{{ $contact->nick }}</td>
-                    <td>{{ $contact->homepage }}</td>
-                    <td>{{ $contact->twitter }}</td>
-                    <td>{{ $contact->facebook }}</td>
-                    <td><a href="/admin/contacts/{{ $contact->id }}/edit">edit</a></td>
-                </tr>
-@endforeach
-            </table>
+    <h1>Contacts</h1>
+    <table>
+        <tr>
+            <th>Real Name</th>
+            <th>Nick</th>
+            <th>Homepage</th>
+            <th>Twitter</th>
+            <th>Facebook</th>
+            <th></th>
+        </tr>
+        @foreach($contacts as $contact)
+            <tr>
+                <td>{{ $contact->name }}</td>
+                <td>{{ $contact->nick }}</td>
+                <td>{{ $contact->homepage }}</td>
+                <td>{{ $contact->twitter }}</td>
+                <td>{{ $contact->facebook }}</td>
+                <td><a href="/admin/contacts/{{ $contact->id }}/edit">edit</a></td>
+            </tr>
+        @endforeach
+    </table>
 @stop
diff --git a/resources/views/admin/likes/create.blade.php b/resources/views/admin/likes/create.blade.php
index 089d6f43..1f60049c 100644
--- a/resources/views/admin/likes/create.blade.php
+++ b/resources/views/admin/likes/create.blade.php
@@ -3,15 +3,15 @@
 @section('title')New Like « Admin CP « @stop
 
 @section('content')
-            <h1>New Like</h1>
-            <form action="/admin/likes/" method="post" accept-charset="utf-8" class="admin-form form">
-                {{ csrf_field() }}
-                <div>
-                    <label for="like_url">Like URL:</label>
-                    <input type="text" name="like_url" id="like_url" placeholder="Like URL">
-                </div>
-                <div>
-                    <button type="submit" name="submit">Submit</button>
-                </div>
-            </form>
+    <h1>New Like</h1>
+    <form action="/admin/likes/" method="post" accept-charset="utf-8" class="admin-form form">
+        {{ csrf_field() }}
+        <div>
+            <label for="like_url">Like URL:</label>
+            <input type="text" name="like_url" id="like_url" placeholder="Like URL">
+        </div>
+        <div>
+            <button type="submit" name="submit">Submit</button>
+        </div>
+    </form>
 @stop
diff --git a/resources/views/admin/likes/edit.blade.php b/resources/views/admin/likes/edit.blade.php
index d5de12f5..8a4953f5 100644
--- a/resources/views/admin/likes/edit.blade.php
+++ b/resources/views/admin/likes/edit.blade.php
@@ -3,22 +3,22 @@
 @section('title')Edit Like « Admin CP « @stop
 
 @section('content')
-            <h1>Edit Like</h1>
-            <form action="/admin/likes/{{ $id }}" method="post" accept-charset="utf-8" class="admin-form form">
-                {{ csrf_field() }}
-                {{ method_field('PUT') }}
-                <div>
-                    <label for="like_url">Like URL:</label>
-                    <input type="text" name="like_url" id="like_url" value="{{ $like_url }}">
-                </div>
-                <div>
-                    <button type="submit" name="edit">Edit</button>
-                </div>
-            </form>
-            <hr>
-            <form action="/admin/likes/{{ $id }}" method="post">
-                {{ csrf_field() }}
-                {{ method_field('DELETE') }}
-                <button type="submit" name="delete">Delete Like</button>
-            </form>
+    <h1>Edit Like</h1>
+    <form action="/admin/likes/{{ $id }}" method="post" accept-charset="utf-8" class="admin-form form">
+        {{ csrf_field() }}
+        {{ method_field('PUT') }}
+        <div>
+            <label for="like_url">Like URL:</label>
+            <input type="text" name="like_url" id="like_url" value="{{ $like_url }}">
+        </div>
+        <div>
+            <button type="submit" name="edit">Edit</button>
+        </div>
+    </form>
+    <hr>
+    <form action="/admin/likes/{{ $id }}" method="post">
+        {{ csrf_field() }}
+        {{ method_field('DELETE') }}
+        <button type="submit" name="delete">Delete Like</button>
+    </form>
 @stop
diff --git a/resources/views/admin/likes/index.blade.php b/resources/views/admin/likes/index.blade.php
index 874eacd1..f18e5605 100644
--- a/resources/views/admin/likes/index.blade.php
+++ b/resources/views/admin/likes/index.blade.php
@@ -3,13 +3,16 @@
 @section('title')List Likes « Admin CP « @stop
 
 @section('content')
-            <h1>Likes</h1>
-            <ul>
-@foreach($likes as $like)
-                <li>{{ $like['url'] }}
-                    <a href="/admin/likes/{{ $like['id'] }}/edit">edit?</a>
-                </li>
-@endforeach
-            </ul>
-            <p>Create a <a href="/admin/likes/create">new like</a>?</p>
+    <h1>Likes</h1>
+    <ul>
+    @foreach($likes as $like)
+        <li>
+            {{ $like['url'] }}
+            <a href="/admin/likes/{{ $like['id'] }}/edit">edit?</a>
+        </li>
+    @endforeach
+    </ul>
+    <p>
+        Create a <a href="/admin/likes/create">new like</a>?
+    </p>
 @stop
diff --git a/resources/views/admin/notes/create.blade.php b/resources/views/admin/notes/create.blade.php
index 6fc628bb..5158746a 100644
--- a/resources/views/admin/notes/create.blade.php
+++ b/resources/views/admin/notes/create.blade.php
@@ -3,37 +3,37 @@
 @section('title')New Note « Admin CP « @stop
 
 @section('content')
-@if (count($errors) > 0)
-            <div class="errors">
-                <ul>
-@foreach ($errors->all() as $error)
-                    <li>{{ $error }}</li>
-@endforeach
-                </ul>
-            </div>
-@endif
-            <form action="/admin/notes" method="post" accept-charset="utf-8" class="admin-form form">
-                {{ csrf_field() }}
-                <div>
-                    <label for="in-reply-to" accesskey="r">Reply-to: </label>
-                    <input type="text"
-                           name="in-reply-to"
-                           id="in-reply-to"
-                           placeholder="in-reply-to-1 in-reply-to-2 …"
-                    >
-                </div>
-                <div>
-                    <label for="content" accesskey="n">Note: </label>
-                    <textarea name="content"
-                              id="content"
-                              placeholder="Note"
-                              autofocus="autofocus"
-                    >{{ old('content') }}</textarea>
-                </div>
-                <div>
-                    <button type="submit"
-                            name="submit"
-                    >Submit</button>
-                </div>
-            </form>
+    @if (count($errors) > 0)
+        <div class="errors">
+            <ul>
+            @foreach ($errors->all() as $error)
+                <li>{{ $error }}</li>
+            @endforeach
+            </ul>
+        </div>
+    @endif
+    <form action="/admin/notes" method="post" accept-charset="utf-8" class="admin-form form">
+        {{ csrf_field() }}
+        <div>
+            <label for="in-reply-to" accesskey="r">Reply-to: </label>
+            <input type="text"
+                   name="in-reply-to"
+                   id="in-reply-to"
+                   placeholder="in-reply-to-1 in-reply-to-2 …"
+            >
+        </div>
+        <div>
+            <label for="content" accesskey="n">Note: </label>
+            <textarea name="content"
+                      id="content"
+                      placeholder="Note"
+                      autofocus="autofocus"
+            >{{ old('content') }}</textarea>
+        </div>
+        <div>
+            <button type="submit"
+                    name="submit"
+            >Submit</button>
+        </div>
+    </form>
 @stop
diff --git a/resources/views/admin/notes/edit.blade.php b/resources/views/admin/notes/edit.blade.php
index 9530dd2f..fdc3febf 100644
--- a/resources/views/admin/notes/edit.blade.php
+++ b/resources/views/admin/notes/edit.blade.php
@@ -3,31 +3,31 @@
 @section('title')Edit Note « Admin CP « @stop
 
 @section('content')
-            <form action="/admin/notes/{{ $note->id }}" method="post" accept-charset="utf-8" class="admin-form form">
-                {{ csrf_field() }}
-                {{ method_field('PUT') }}
-                <div>
-                    <label for="in-reply-to" accesskey="r">Reply-to: </label>
-                    <input type="text" name="in-reply-to" id="in-reply-to" placeholder="in-reply-to-1 in-reply-to-2 …" tabindex="1" value="{{ $note->in_reply_to }}">
-                </div>
-                <div>
-                    <label for="content" accesskey="n">Note: </label>
-                    <textarea name="content" id="content" placeholder="Note" tabindex="2">{{ $note->originalNote }}</textarea>
-                </div>
-                <div class="form-row">
-                    <label for="webmentions" accesskey="w">Send webmentions: </label>
-                    <input type="checkbox" name="webmentions" id="webmentions" checked="checked" tabindex="3">
-                </div>
-                <div>
-                    <button type="submit" name="submit">Submit</button>
-                </div>
-            </form>
-            <hr>
-            <form action="/admin/notes/{{ $note->id }}" method="post" accept-charset="utf-8" class="form">
-                {{ csrf_field() }}
-                {{ method_field('DELETE') }}
-                <div>
-                    <button type="submit" name="delete">Delete</button>
-                </div>
-            </form>
+    <form action="/admin/notes/{{ $note->id }}" method="post" accept-charset="utf-8" class="admin-form form">
+        {{ csrf_field() }}
+        {{ method_field('PUT') }}
+        <div>
+            <label for="in-reply-to" accesskey="r">Reply-to: </label>
+            <input type="text" name="in-reply-to" id="in-reply-to" placeholder="in-reply-to-1 in-reply-to-2 …" tabindex="1" value="{{ $note->in_reply_to }}">
+        </div>
+        <div>
+            <label for="content" accesskey="n">Note: </label>
+            <textarea name="content" id="content" placeholder="Note" tabindex="2">{{ $note->originalNote }}</textarea>
+        </div>
+        <div class="form-row">
+            <label for="webmentions" accesskey="w">Send webmentions: </label>
+            <input type="checkbox" name="webmentions" id="webmentions" checked="checked" tabindex="3">
+        </div>
+        <div>
+            <button type="submit" name="submit">Submit</button>
+        </div>
+    </form>
+    <hr>
+    <form action="/admin/notes/{{ $note->id }}" method="post" accept-charset="utf-8" class="form">
+        {{ csrf_field() }}
+        {{ method_field('DELETE') }}
+        <div>
+            <button type="submit" name="delete">Delete</button>
+        </div>
+    </form>
 @stop
diff --git a/resources/views/admin/notes/index.blade.php b/resources/views/admin/notes/index.blade.php
index 909fcc2f..f4621981 100644
--- a/resources/views/admin/notes/index.blade.php
+++ b/resources/views/admin/notes/index.blade.php
@@ -3,10 +3,12 @@
 @section('title')List Notes « Admin CP « @stop
 
 @section('content')
-            <p>Select note to edit:</p>
-            <ol reversed>
-@foreach($notes as $note)
-                <li><a href="/admin/notes/{{ $note->id }}/edit">{{ $note->originalNote }}</a></li>
-@endforeach
-            </ol>
+    <p>Select note to edit:</p>
+    <ol reversed>
+    @foreach($notes as $note)
+        <li>
+            <a href="/admin/notes/{{ $note->id }}/edit">{{ $note->originalNote }}</a>
+        </li>
+    @endforeach
+    </ol>
 @stop
diff --git a/resources/views/admin/places/create.blade.php b/resources/views/admin/places/create.blade.php
index a9c625e3..72b0744a 100644
--- a/resources/views/admin/places/create.blade.php
+++ b/resources/views/admin/places/create.blade.php
@@ -3,37 +3,36 @@
 @section('title')New Place « Admin CP « @stop
 
 @section('content')
-            <h1>New Place</h1>
-            <form action="/admin/places/" method="post" accept-charset="utf-8" class="admin-form form">
-                {{ csrf_field() }}
-                <div>
-                    <label for="name">Name:</label>
-                    <input type="text" name="name" id="name" placeholder="Place Name">
-                </div>
-                <div>
-                    <label for="description">Description:</label>
-                    <input type="text" name="description" id="description" placeholder="Description">
-                </div>
-                <div>
-                    <label for="latitude">Latitude:</label>
-                    <input type="text" name="latitude" id="latitude" placeholder="Latitude">
-                </div>
-                <div>
-                    <label for="longitude">Longitude:</label>
-                    <input type="text" name="longitude" id="longitude" placeholder="Longitude">
-                </div>
-                <div>
-                    <input type="submit" name="submit" value="Submit">
-                </div>
-                <h2>Location</h2>
-                <div>
-                    <button type="button" name="locate" id="locate">Locate</button>
-                </div>
-            </form>
+    <h1>New Place</h1>
+    <form action="/admin/places/" method="post" accept-charset="utf-8" class="admin-form form">
+        {{ csrf_field() }}
+        <div>
+            <label for="name">Name:</label>
+            <input type="text" name="name" id="name" placeholder="Place Name">
+        </div>
+        <div>
+            <label for="description">Description:</label>
+            <input type="text" name="description" id="description" placeholder="Description">
+        </div>
+        <div>
+            <label for="latitude">Latitude:</label>
+            <input type="text" name="latitude" id="latitude" placeholder="Latitude">
+        </div>
+        <div>
+            <label for="longitude">Longitude:</label>
+            <input type="text" name="longitude" id="longitude" placeholder="Longitude">
+        </div>
+        <div>
+            <input type="submit" name="submit" value="Submit">
+        </div>
+        <h2>Location</h2>
+        <div>
+            <button type="button" name="locate" id="locate">Locate</button>
+        </div>
+    </form>
 @stop
 
 @section('scripts')
-@include('templates.mapbox-links')
-
-            <script src="/assets/js/newplace.js"></script>
+    @include('templates.mapbox-links')
+    <script src="/assets/js/newplace.js"></script>
 @stop
diff --git a/resources/views/admin/places/edit.blade.php b/resources/views/admin/places/edit.blade.php
index 301a797e..5e539d44 100644
--- a/resources/views/admin/places/edit.blade.php
+++ b/resources/views/admin/places/edit.blade.php
@@ -3,144 +3,146 @@
 @section('title')Edit Place « Admin CP « @stop
 
 @section('content')
-            <h1>Edit Place</h1>
-            <form action="/admin/places/{{ $place->id }}" method="post" accept-charset="utf-8" class="admin-form form">
-                {{ csrf_field() }}
-                {{ method_field('PUT') }}
-                <div>
-                    <label for="name">Name:</label>
-                    <input type="text" name="name" id="name" value="{{ $place->name }}">
-                </div>
-                <div>
-                    <label for="description">Description</label>
-                    <textarea name="description" id="description">{{ $place->description }}</textarea>
-                </div>
-                <div>
-                    <p>Location</p>
-                    <div class="map" data-latitude="{{ $place->latitude }}" data-longitude="{{ $place->longitude }}" data-id="{{ $place->id }}"></div>
-                    <script>
-                        var geojson{{ $place->id }} = {
-                            "type": "FeatureCollection",
-                            "features": [{
-                                "type": "Feature",
-                                "geometry": {
-                                    "type": "Point",
-                                    "coordinates": [{{ $place->longitude }}, {{ $place->latitude }}]
-                                },
-                                "properties": {
-                                    "title": "{{ $place->name }}",
-                                    "icon": "{{ $place->icon ?? 'marker' }}"
-                                }
-                            }]
+    <h1>Edit Place</h1>
+    <form action="/admin/places/{{ $place->id }}" method="post" accept-charset="utf-8" class="admin-form form">
+        {{ csrf_field() }}
+        {{ method_field('PUT') }}
+        <div>
+            <label for="name">Name:</label>
+            <input type="text" name="name" id="name" value="{{ $place->name }}">
+        </div>
+        <div>
+            <label for="description">Description</label>
+            <textarea name="description" id="description">{{ $place->description }}</textarea>
+        </div>
+        <div>
+            <p>Location</p>
+            <div class="map" data-latitude="{{ $place->latitude }}" data-longitude="{{ $place->longitude }}" data-id="{{ $place->id }}"></div>
+            <script>
+                var geojson{{ $place->id }} = {
+                    "type": "FeatureCollection",
+                    "features": [{
+                        "type": "Feature",
+                        "geometry": {
+                            "type": "Point",
+                            "coordinates": [{{ $place->longitude }}, {{ $place->latitude }}]
+                        },
+                        "properties": {
+                            "title": "{{ $place->name }}",
+                            "icon": "{{ $place->icon ?? 'marker' }}"
                         }
-                    </script>
-                </div>
-                <div>
-                    <label for="latitude">Latitude:</label>
-                    <input type="text" name="latitude" id="latitude" value="{{ $place->latitude }}">
-                </div>
-                <div>
-                    <label for="longitude">Longitude:</label>
-                    <input type="text" name="longitude" id="longitude" value="{{ $place->longitude }}">
-                </div>
-                <div class="form-row">
-                    <label for="icon">Map Icon</label>
-                    <select name="icon" id="icon">
-                        <option value="airfield"@if($place->icon == 'airfield')selected @endif>airfield</option>
-                        <option value="airport"@if($place->icon == 'airport')selected @endif>airport</option>
-                        <option value="alcohol-shop"@if($place->icon == 'alcohol-shop')selected @endif>alcohol-shop</option>
-                        <option value="amusement-park"@if($place->icon == 'amusement-park')selected @endif>amusement-park</option>
-                        <option value="aquarium"@if($place->icon == 'aquarium')selected @endif>aquarium</option>
-                        <option value="art-gallery"@if($place->icon == 'art-gallery')selected @endif>art-gallery</option>
-                        <option value="attraction"@if($place->icon == 'attraction')selected @endif>attraction</option>
-                        <option value="bakery"@if($place->icon == 'bakery')selected @endif>bakery</option>
-                        <option value="bank"@if($place->icon == 'bank')selected @endif>bank</option>
-                        <option value="bar"@if($place->icon == 'bar')selected @endif>bar</option>
-                        <option value="beer"@if($place->icon == 'beer')selected @endif>beer</option>
-                        <option value="bicycle"@if($place->icon == 'bicycle')selected @endif>bicycle</option>
-                        <option value="bicycle-share"@if($place->icon == 'bicycle-share')selected @endif>bicycle-share</option>
-                        <option value="bus"@if($place->icon == 'bus')selected @endif>bus</option>
-                        <option value="cafe"@if($place->icon == 'cafe')selected @endif>cafe</option>
-                        <option value="campsite"@if($place->icon == 'campsite')selected @endif>campsite</option>
-                        <option value="car"@if($place->icon == 'car')selected @endif>car</option>
-                        <option value="castle"@if($place->icon == 'castle')selected @endif>castle</option>
-                        <option value="cemetery"@if($place->icon == 'cemetery')selected @endif>cemetery</option>
-                        <option value="cinema"@if($place->icon == 'cinema')selected @endif>cinema</option>
-                        <option value="circle"@if($place->icon == 'circle')selected @endif>circle</option>
-                        <option value="circle-stroked"@if($place->icon == 'circle-stroked')selected @endif>circle-stroked</option>
-                        <option value="clothing-store"@if($place->icon == 'clothing-store')selected @endif>clothing-store</option>
-                        <option value="college"@if($place->icon == 'college')selected @endif>college</option>
-                        <option value="dentist"@if($place->icon == 'dentist')selected @endif>dentist</option>
-                        <option value="doctor"@if($place->icon == 'doctor')selected @endif>doctor</option>
-                        <option value="dog-park"@if($place->icon == 'dog-park')selected @endif>dog-park</option>
-                        <option value="drinking-water"@if($place->icon == 'drinking-water')selected @endif>drinking-water</option>
-                        <option value="embassy"@if($place->icon == 'embassy')selected @endif>embassy</option>
-                        <option value="entrance"@if($place->icon == 'entrance')selected @endif>entrance</option>
-                        <option value="fast-food"@if($place->icon == 'fast-food')selected @endif>fast-food</option>
-                        <option value="ferry"@if($place->icon == 'ferry')selected @endif>ferry</option>
-                        <option value="fire-station"@if($place->icon == 'fire-station')selected @endif>fire-station</option>
-                        <option value="fuel"@if($place->icon == 'fuel')selected @endif>fuel</option>
-                        <option value="garden"@if($place->icon == 'garden')selected @endif>garden</option>
-                        <option value="golf"@if($place->icon == 'golf')selected @endif>golf</option>
-                        <option value="grocery"@if($place->icon == 'grocery')selected @endif>grocery</option>
-                        <option value="harbor"@if($place->icon == 'harbor')selected @endif>harbor</option>
-                        <option value="heliport"@if($place->icon == 'heliport')selected @endif>heliport</option>
-                        <option value="hospital"@if($place->icon == 'hospital')selected @endif>hospital</option>
-                        <option value="ice-cream"@if($place->icon == 'ice-cream')selected @endif>ice-cream</option>
-                        <option value="information"@if($place->icon == 'information')selected @endif>information</option>
-                        <option value="laundry"@if($place->icon == 'laundry')selected @endif>laundry</option>
-                        <option value="library"@if($place->icon == 'library')selected @endif>library</option>
-                        <option value="lodging"@if($place->icon == 'lodging')selected @endif>lodging</option>
-                        <option value="marker"@if($place->icon == 'marker')selected @endif>marker</option>
-                        <option value="monument"@if($place->icon == 'monument')selected @endif>monument</option>
-                        <option value="mountain"@if($place->icon == 'mountain')selected @endif>mountain</option>
-                        <option value="museum"@if($place->icon == 'museum')selected @endif>museum</option>
-                        <option value="music"@if($place->icon == 'music')selected @endif>music</option>
-                        <option value="park"@if($place->icon == 'park')selected @endif>park</option>
-                        <option value="pharmacy"@if($place->icon == 'pharmacy')selected @endif>pharmacy</option>
-                        <option value="picnic-site"@if($place->icon == 'picnic-site')selected @endif>picnic-site</option>
-                        <option value="place-of-worship"@if($place->icon == 'place-of-worship')selected @endif>place-of-worship</option>
-                        <option value="playground"@if($place->icon == 'playground')selected @endif>playground</option>
-                        <option value="police"@if($place->icon == 'police')selected @endif>police</option>
-                        <option value="post"@if($place->icon == 'post')selected @endif>post</option>
-                        <option value="prison"@if($place->icon == 'prison')selected @endif>prison</option>
-                        <option value="rail"@if($place->icon == 'rail')selected @endif>rail</option>
-                        <option value="rail-light"@if($place->icon == 'rail-light')selected @endif>rail-light</option>
-                        <option value="rail-metro"@if($place->icon == 'rail-metro')selected @endif>rail-metro</option>
-                        <option value="religious-christian"@if($place->icon == 'religious-christian')selected @endif>religious-christian</option>
-                        <option value="religious-jewish"@if($place->icon == 'religious-jewish')selected @endif>religious-jewish</option>
-                        <option value="religious-muslim"@if($place->icon == 'religious-muslim')selected @endif>religious-muslim</option>
-                        <option value="restaurant"@if($place->icon == 'restaurant')selected @endif>restaurant</option>
-                        <option value="rocket"@if($place->icon == 'rocket')selected @endif>rocket</option>
-                        <option value="school"@if($place->icon == 'school')selected @endif>school</option>
-                        <option value="shop"@if($place->icon == 'shop')selected @endif>shop</option>
-                        <option value="stadium"@if($place->icon == 'stadium')selected @endif>stadium</option>
-                        <option value="star"@if($place->icon == 'star')selected @endif>star</option>
-                        <option value="suitcase"@if($place->icon == 'suitcase')selected @endif>suitcase</option>
-                        <option value="swimming"@if($place->icon == 'swimming')selected @endif>swimming</option>
-                        <option value="theatre"@if($place->icon == 'theatre')selected @endif>theatre</option>
-                        <option value="toilet"@if($place->icon == 'toilet')selected @endif>toilet</option>
-                        <option value="town-hall"@if($place->icon == 'town-hall')selected @endif>town-hall</option>
-                        <option value="triangle"@if($place->icon == 'triangle')selected @endif>triangle</option>
-                        <option value="triangle-stroked"@if($place->icon == 'triangle-stroked')selected @endif>triangle-stroked</option>
-                        <option value="veterinary"@if($place->icon == 'veterinary')selected @endif>veterinary</option>
-                        <option value="volcano"@if($place->icon == 'volcano')selected @endif>volcano</option>
-                        <option value="zoo"@if($place->icon == 'zoo')selected @endif>zoo</option>
-                    </select>
-                </div>
-                <div>
-                    <button type="submit" name="edit">Edit</button>
-                </div>
-                <hr>
-                <div>
-                    <button type="submit" name="delete">Delete</button>
-                </div>
-            </form>
+                    }]
+                }
+            </script>
+        </div>
+        <div>
+            <label for="latitude">Latitude:</label>
+            <input type="text" name="latitude" id="latitude" value="{{ $place->latitude }}">
+        </div>
+        <div>
+            <label for="longitude">Longitude:</label>
+            <input type="text" name="longitude" id="longitude" value="{{ $place->longitude }}">
+        </div>
+        <div class="form-row">
+            <label for="icon">Map Icon</label>
+            <select name="icon" id="icon">
+                <option value="airfield"@if($place->icon == 'airfield')selected @endif>airfield</option>
+                <option value="airport"@if($place->icon == 'airport')selected @endif>airport</option>
+                <option value="alcohol-shop"@if($place->icon == 'alcohol-shop')selected @endif>alcohol-shop</option>
+                <option value="amusement-park"@if($place->icon == 'amusement-park')selected @endif>amusement-park</option>
+                <option value="aquarium"@if($place->icon == 'aquarium')selected @endif>aquarium</option>
+                <option value="art-gallery"@if($place->icon == 'art-gallery')selected @endif>art-gallery</option>
+                <option value="attraction"@if($place->icon == 'attraction')selected @endif>attraction</option>
+                <option value="bakery"@if($place->icon == 'bakery')selected @endif>bakery</option>
+                <option value="bank"@if($place->icon == 'bank')selected @endif>bank</option>
+                <option value="bar"@if($place->icon == 'bar')selected @endif>bar</option>
+                <option value="beer"@if($place->icon == 'beer')selected @endif>beer</option>
+                <option value="bicycle"@if($place->icon == 'bicycle')selected @endif>bicycle</option>
+                <option value="bicycle-share"@if($place->icon == 'bicycle-share')selected @endif>bicycle-share</option>
+                <option value="bus"@if($place->icon == 'bus')selected @endif>bus</option>
+                <option value="cafe"@if($place->icon == 'cafe')selected @endif>cafe</option>
+                <option value="campsite"@if($place->icon == 'campsite')selected @endif>campsite</option>
+                <option value="car"@if($place->icon == 'car')selected @endif>car</option>
+                <option value="castle"@if($place->icon == 'castle')selected @endif>castle</option>
+                <option value="cemetery"@if($place->icon == 'cemetery')selected @endif>cemetery</option>
+                <option value="cinema"@if($place->icon == 'cinema')selected @endif>cinema</option>
+                <option value="circle"@if($place->icon == 'circle')selected @endif>circle</option>
+                <option value="circle-stroked"@if($place->icon == 'circle-stroked')selected @endif>circle-stroked</option>
+                <option value="clothing-store"@if($place->icon == 'clothing-store')selected @endif>clothing-store</option>
+                <option value="college"@if($place->icon == 'college')selected @endif>college</option>
+                <option value="dentist"@if($place->icon == 'dentist')selected @endif>dentist</option>
+                <option value="doctor"@if($place->icon == 'doctor')selected @endif>doctor</option>
+                <option value="dog-park"@if($place->icon == 'dog-park')selected @endif>dog-park</option>
+                <option value="drinking-water"@if($place->icon == 'drinking-water')selected @endif>drinking-water</option>
+                <option value="embassy"@if($place->icon == 'embassy')selected @endif>embassy</option>
+                <option value="entrance"@if($place->icon == 'entrance')selected @endif>entrance</option>
+                <option value="fast-food"@if($place->icon == 'fast-food')selected @endif>fast-food</option>
+                <option value="ferry"@if($place->icon == 'ferry')selected @endif>ferry</option>
+                <option value="fire-station"@if($place->icon == 'fire-station')selected @endif>fire-station</option>
+                <option value="fuel"@if($place->icon == 'fuel')selected @endif>fuel</option>
+                <option value="garden"@if($place->icon == 'garden')selected @endif>garden</option>
+                <option value="golf"@if($place->icon == 'golf')selected @endif>golf</option>
+                <option value="grocery"@if($place->icon == 'grocery')selected @endif>grocery</option>
+                <option value="harbor"@if($place->icon == 'harbor')selected @endif>harbor</option>
+                <option value="heliport"@if($place->icon == 'heliport')selected @endif>heliport</option>
+                <option value="hospital"@if($place->icon == 'hospital')selected @endif>hospital</option>
+                <option value="ice-cream"@if($place->icon == 'ice-cream')selected @endif>ice-cream</option>
+                <option value="information"@if($place->icon == 'information')selected @endif>information</option>
+                <option value="laundry"@if($place->icon == 'laundry')selected @endif>laundry</option>
+                <option value="library"@if($place->icon == 'library')selected @endif>library</option>
+                <option value="lodging"@if($place->icon == 'lodging')selected @endif>lodging</option>
+                <option value="marker"@if($place->icon == 'marker')selected @endif>marker</option>
+                <option value="monument"@if($place->icon == 'monument')selected @endif>monument</option>
+                <option value="mountain"@if($place->icon == 'mountain')selected @endif>mountain</option>
+                <option value="museum"@if($place->icon == 'museum')selected @endif>museum</option>
+                <option value="music"@if($place->icon == 'music')selected @endif>music</option>
+                <option value="park"@if($place->icon == 'park')selected @endif>park</option>
+                <option value="pharmacy"@if($place->icon == 'pharmacy')selected @endif>pharmacy</option>
+                <option value="picnic-site"@if($place->icon == 'picnic-site')selected @endif>picnic-site</option>
+                <option value="place-of-worship"@if($place->icon == 'place-of-worship')selected @endif>place-of-worship</option>
+                <option value="playground"@if($place->icon == 'playground')selected @endif>playground</option>
+                <option value="police"@if($place->icon == 'police')selected @endif>police</option>
+                <option value="post"@if($place->icon == 'post')selected @endif>post</option>
+                <option value="prison"@if($place->icon == 'prison')selected @endif>prison</option>
+                <option value="rail"@if($place->icon == 'rail')selected @endif>rail</option>
+                <option value="rail-light"@if($place->icon == 'rail-light')selected @endif>rail-light</option>
+                <option value="rail-metro"@if($place->icon == 'rail-metro')selected @endif>rail-metro</option>
+                <option value="religious-christian"@if($place->icon == 'religious-christian')selected @endif>religious-christian</option>
+                <option value="religious-jewish"@if($place->icon == 'religious-jewish')selected @endif>religious-jewish</option>
+                <option value="religious-muslim"@if($place->icon == 'religious-muslim')selected @endif>religious-muslim</option>
+                <option value="restaurant"@if($place->icon == 'restaurant')selected @endif>restaurant</option>
+                <option value="rocket"@if($place->icon == 'rocket')selected @endif>rocket</option>
+                <option value="school"@if($place->icon == 'school')selected @endif>school</option>
+                <option value="shop"@if($place->icon == 'shop')selected @endif>shop</option>
+                <option value="stadium"@if($place->icon == 'stadium')selected @endif>stadium</option>
+                <option value="star"@if($place->icon == 'star')selected @endif>star</option>
+                <option value="suitcase"@if($place->icon == 'suitcase')selected @endif>suitcase</option>
+                <option value="swimming"@if($place->icon == 'swimming')selected @endif>swimming</option>
+                <option value="theatre"@if($place->icon == 'theatre')selected @endif>theatre</option>
+                <option value="toilet"@if($place->icon == 'toilet')selected @endif>toilet</option>
+                <option value="town-hall"@if($place->icon == 'town-hall')selected @endif>town-hall</option>
+                <option value="triangle"@if($place->icon == 'triangle')selected @endif>triangle</option>
+                <option value="triangle-stroked"@if($place->icon == 'triangle-stroked')selected @endif>triangle-stroked</option>
+                <option value="veterinary"@if($place->icon == 'veterinary')selected @endif>veterinary</option>
+                <option value="volcano"@if($place->icon == 'volcano')selected @endif>volcano</option>
+                <option value="zoo"@if($place->icon == 'zoo')selected @endif>zoo</option>
+            </select>
+        </div>
+        <div>
+            <button type="submit" name="edit">Edit</button>
+        </div>
+        <hr>
+        <div>
+            <button type="submit" name="delete">Delete</button>
+        </div>
+    </form>
 
-            <p><a href="/admin/places/{{ $place->id }}/merge">Merge with another place?</a></p>
+    <p>
+        <a href="/admin/places/{{ $place->id }}/merge">Merge with another place?</a>
+    </p>
 @stop
 
 @section('scripts')
-  <script src="/assets/js/places.js"></script>
-  <link rel="stylesheet" href="/assets/frontend/mapbox-gl.css">
+    <script src="/assets/js/places.js"></script>
+    <link rel="stylesheet" href="/assets/frontend/mapbox-gl.css">
 @stop
diff --git a/resources/views/admin/places/index.blade.php b/resources/views/admin/places/index.blade.php
index 62b75663..386df190 100644
--- a/resources/views/admin/places/index.blade.php
+++ b/resources/views/admin/places/index.blade.php
@@ -3,11 +3,16 @@
 @section('title')List Places « Admin CP « @stop
 
 @section('content')
-            <h1>Places</h1>
-            <ul>
-@foreach($places as $place)
-                <li>{{ $place['name'] }} <a href="/admin/places/{{ $place['id'] }}/edit">edit?</a></li>
-@endforeach
-            </ul>
-            <p>Create a <a href="/admin/places/create">new entry</a>?</p>
+    <h1>Places</h1>
+    <ul>
+    @foreach($places as $place)
+        <li>
+            {{ $place['name'] }}
+            <a href="/admin/places/{{ $place['id'] }}/edit">edit?</a>
+        </li>
+    @endforeach
+    </ul>
+    <p>
+        Create a <a href="/admin/places/create">new entry</a>?
+    </p>
 @stop
diff --git a/resources/views/admin/places/merge/edit.blade.php b/resources/views/admin/places/merge/edit.blade.php
index 791fba83..acaa4424 100644
--- a/resources/views/admin/places/merge/edit.blade.php
+++ b/resources/views/admin/places/merge/edit.blade.php
@@ -3,43 +3,43 @@
 @section('title')Merge Places « Admin CP « @stop
 
 @section('content')
-            <h1>Merge places</h1>
-            <p>When a place is deleted, it is removed from the database, and all the notes associated with it, will be re-associated with the other place.</p>
-            <table>
-                <tr>
-                    <th></th>
-                    <th>Place 1</th>
-                    <th>Place 2</th>
-                </tr>
-                <tr>
-                    <th>Name</th>
-                    <td>{{ $place1->name }}</td>
-                    <td>{{ $place2->name }}</td>
-                </tr>
-                <tr>
-                    <th>Description</th>
-                    <td>{{ $place1->description }}</td>
-                    <td>{{ $place2->description }}</td>
-                </tr>
-                <tr>
-                    <th>location</th>
-                    <td>{{ $place1->latitude }}, {{ $place1->longitude }}</td>
-                    <td>{{ $place2->latitude }}, {{ $place2->longitude }}</td>
-                </tr>
-                <tr>
-                    <th>Foursquare</th>
-                    <td>{{ $place1->foursquare }}</td>
-                    <td>{{ $place2->foursquare }}</td>
-                </tr>
-                <tr>
-                    <td></td>
-                    <form action="/admin/places/merge" method="post">
-                    {{ csrf_field() }}
-                    <input type="hidden" name="place1" value="{{ $place1->id }}">
-                    <input type="hidden" name="place2" value="{{ $place2->id }}">
-                    <td><button type="submit" name="delete" value="1">Delete Place 1</button></td>
-                    <td><button type="submit" name="delete" value="2">Delete Place 2</button></td>
-                    </form>
-                </tr>
-            </table>
+    <h1>Merge places</h1>
+    <p>When a place is deleted, it is removed from the database, and all the notes associated with it, will be re-associated with the other place.</p>
+    <table>
+        <tr>
+            <th></th>
+            <th>Place 1</th>
+            <th>Place 2</th>
+        </tr>
+        <tr>
+            <th>Name</th>
+            <td>{{ $place1->name }}</td>
+            <td>{{ $place2->name }}</td>
+        </tr>
+        <tr>
+            <th>Description</th>
+            <td>{{ $place1->description }}</td>
+            <td>{{ $place2->description }}</td>
+        </tr>
+        <tr>
+            <th>location</th>
+            <td>{{ $place1->latitude }}, {{ $place1->longitude }}</td>
+            <td>{{ $place2->latitude }}, {{ $place2->longitude }}</td>
+        </tr>
+        <tr>
+            <th>Foursquare</th>
+            <td>{{ $place1->foursquare }}</td>
+            <td>{{ $place2->foursquare }}</td>
+        </tr>
+        <tr>
+            <td></td>
+            <form action="/admin/places/merge" method="post">
+            {{ csrf_field() }}
+            <input type="hidden" name="place1" value="{{ $place1->id }}">
+            <input type="hidden" name="place2" value="{{ $place2->id }}">
+            <td><button type="submit" name="delete" value="1">Delete Place 1</button></td>
+            <td><button type="submit" name="delete" value="2">Delete Place 2</button></td>
+            </form>
+        </tr>
+    </table>
 @stop
diff --git a/resources/views/admin/places/merge/index.blade.php b/resources/views/admin/places/merge/index.blade.php
index ee66477c..cdbd8ebc 100644
--- a/resources/views/admin/places/merge/index.blade.php
+++ b/resources/views/admin/places/merge/index.blade.php
@@ -3,10 +3,12 @@
 @section('title')Merge Places « Admin CP « @stop
 
 @section('content')
-            <p>We shall be merging {{ $first->name }}. It’s location is <code>Point({{ $first->location }})</code>.</p>
-            <ul>
-@foreach($places as $place)
-                <li><a href="/admin/places/{{ $first->id }}/merge/{{ $place->id }}">{{ $place->name }}</a></li>
-@endforeach
-            </ul>
+    <p>We shall be merging {{ $first->name }}. It’s location is <code>Point({{ $first->location }})</code>.</p>
+    <ul>
+    @foreach($places as $place)
+        <li>
+            <a href="/admin/places/{{ $first->id }}/merge/{{ $place->id }}">{{ $place->name }}</a>
+        </li>
+    @endforeach
+    </ul>
 @stop
diff --git a/resources/views/admin/welcome.blade.php b/resources/views/admin/welcome.blade.php
index 3e8600b7..d29468b0 100644
--- a/resources/views/admin/welcome.blade.php
+++ b/resources/views/admin/welcome.blade.php
@@ -3,23 +3,41 @@
 @section('title')Admin CP « @stop
 
 @section('content')
-            <h1>Hello {{ $name }}!</h1>
+    <h1>Hello {{ $name }}!</h1>
 
-            <h2>Articles</h2>
-            <p>You can either <a href="/admin/blog/create">create</a> new blog posts, or <a href="/admin/blog/">edit</a> them.<p>
+    <h2>Articles</h2>
+    <p>
+        You can either <a href="/admin/blog/create">create</a> new blog posts,
+        or <a href="/admin/blog/">edit</a> them.
+    <p>
 
-            <h2>Notes</h2>
-            <p>You can either <a href="/admin/notes/create">create</a> new notes, or <a href="/admin/notes/">edit</a> them.<p>
+    <h2>Notes</h2>
+    <p>
+        You can either <a href="/admin/notes/create">create</a> new notes,
+        or <a href="/admin/notes/">edit</a> them.
+    <p>
 
-            <h2>Likes</h2>
-            <p>You can either <a href="/admin/likes/create">create</a> a new like, or <a href="/admin/likes/">edit</a> them.<p>
+    <h2>Likes</h2>
+    <p>
+        You can either <a href="/admin/likes/create">create</a> a new like,
+        or <a href="/admin/likes/">edit</a> them.
+    <p>
 
-            <h2>Clients</h2>
-            <p>You can either <a href="/admin/clients/create">create</a> new client names, or <a href="/admin/clients/">edit</a> them.</p>
+    <h2>Clients</h2>
+    <p>
+        You can either <a href="/admin/clients/create">create</a> new client names,
+        or <a href="/admin/clients/">edit</a> them.
+    </p>
 
-            <h2>Contacts</h2>
-            <p>You can either <a href="/admin/contacts/create">create</a> new contacts, or <a href="/admin/contacts/">edit</a> them.</p>
+    <h2>Contacts</h2>
+    <p>
+        You can either <a href="/admin/contacts/create">create</a> new contacts,
+        or <a href="/admin/contacts/">edit</a> them.
+    </p>
 
-            <h2>Places</h2>
-            <p>You can either <a href="/admin/places/create">create</a> new places, or <a href="/admin/places/">edit</a> them.</p>
+    <h2>Places</h2>
+    <p>
+        You can either <a href="/admin/places/create">create</a> new places,
+        or <a href="/admin/places/">edit</a> them.
+    </p>
 @stop
diff --git a/resources/views/allplaces.blade.php b/resources/views/allplaces.blade.php
index 66fdae1b..e34c42b7 100644
--- a/resources/views/allplaces.blade.php
+++ b/resources/views/allplaces.blade.php
@@ -3,9 +3,11 @@
 @section('title')Places « @stop
 
 @section('content')
-            <ul>
-            @foreach($places as $place)
-                <li><a href="/places/{{ $place->slug }}">{{ $place->name }}</a></li>
-            @endforeach
-            </ul>
+    <ul>
+        @foreach($places as $place)
+            <li>
+                <a href="/places/{{ $place->slug }}">{{ $place->name }}</a>
+            </li>
+        @endforeach
+    </ul>
 @stop
diff --git a/resources/views/bookmarks/index.blade.php b/resources/views/bookmarks/index.blade.php
index b59753a9..59c7efe1 100644
--- a/resources/views/bookmarks/index.blade.php
+++ b/resources/views/bookmarks/index.blade.php
@@ -3,37 +3,42 @@
 @section('title')Bookmarks « @stop
 
 @section('content')
-            <div class="h-feed top-space">
-@foreach($bookmarks as $bookmark)
-                <div class="h-entry">
-                    <a class="u-bookmark-of<?php if ($bookmark->name !== null) { echo ' h-cite'; } ?>" href="{{ $bookmark->url }}">
-@isset($bookmark->name)
+    <div class="h-feed top-space">
+        @foreach($bookmarks as $bookmark)
+            <div class="h-entry">
+                <a class="u-bookmark-of<?php if ($bookmark->name !== null) { echo ' h-cite'; } ?>" href="{{ $bookmark->url }}">
+                    @isset($bookmark->name)
                         {{ $bookmark->name }}
-@endisset
+                    @endisset
 
-@empty($bookmark->name)
+                    @empty($bookmark->name)
                         {{ $bookmark->url }}
-@endempty
-                    </a> &nbsp; <a href="{{ $bookmark->longurl }}">🔗</a>
-@isset($bookmark->content)
+                    @endempty
+                </a> &nbsp; <a href="{{ $bookmark->longurl }}">🔗</a>
+                @isset($bookmark->content)
                     <p>{{ $bookmark->content }}</p>
-@endisset
-@isset($bookmark->screenshot)
-                    <img class="screenshot" src="/assets/img/bookmarks/{{ $bookmark->screenshot }}.png">
-@endisset
-@isset($bookmark->archive)
-                    <p><a href="https://web.archive.org{{ $bookmark->archive }}">Internet Archive backup</a></p>
-@endisset
-@if($bookmark->tags_count > 0)
-                    <ul class="tags">
-@foreach($bookmark->tags as $tag)
-                        <li><a href="/bookmarks/tagged/{{ $tag->tag }}" class="tag">{{ $tag->tag }}</a></li>
-@endforeach
-                    </ul>
-@endif
-                </div>
-@endforeach
-            </div>
+                @endisset
 
-            {{ $bookmarks->links() }}
+                @isset($bookmark->screenshot)
+                    <img class="screenshot" src="/assets/img/bookmarks/{{ $bookmark->screenshot }}.png">
+                @endisset
+
+                @isset($bookmark->archive)
+                    <p><a href="https://web.archive.org{{ $bookmark->archive }}">Internet Archive backup</a></p>
+                @endisset
+
+                @if($bookmark->tags_count > 0)
+                    <ul class="tags">
+                        @foreach($bookmark->tags as $tag)
+                            <li>
+                                <a href="/bookmarks/tagged/{{ $tag->tag }}" class="tag">{{ $tag->tag }}</a>
+                            </li>
+                        @endforeach
+                    </ul>
+                @endif
+            </div>
+        @endforeach
+    </div>
+
+    {{ $bookmarks->links() }}
 @stop
diff --git a/resources/views/bookmarks/show.blade.php b/resources/views/bookmarks/show.blade.php
index 50b420eb..4a0d3164 100644
--- a/resources/views/bookmarks/show.blade.php
+++ b/resources/views/bookmarks/show.blade.php
@@ -3,36 +3,5 @@
 @section('title')Bookmark « @stop
 
 @section('content')
-            <div class="h-entry top-space">
-                <a class="u-bookmark-of<?php if ($bookmark->name !== null) { echo ' h-cite'; } ?>" href="{{ $bookmark->url }}">
-@isset($bookmark->name)
-                    {{ $bookmark->name }}
-@endisset
-
-@empty($bookmark->name)
-                    {{ $bookmark->url }}
-@endempty
-                </a>
-@isset($bookmark->content)
-                <p>{{ $bookmark->content }}</p>
-@endisset
-@isset($bookmark->screenshot)
-                <img class="screenshot" src="/assets/img/bookmarks/{{ $bookmark->screenshot }}.png">
-@endisset
-@isset($bookmark->archive)
-                <p><a href="https://web.archive.org{{ $bookmark->archive }}">Internet Archive backup</a></p>
-@endisset
-@if(count($bookmark->tags) > 0)
-                <ul class="tags">
-@foreach($bookmark->tags as $tag)
-                    <li><a href="/bookmarks/tagged/{{ $tag->tag }}" class="tag">{{ $tag->tag }}</a></li>
-@endforeach
-                </ul>
-@endif
-                <p class="p-bridgy-facebook-content">🔖 {{ $bookmark->url }} 🔗 {{ $bookmark->longurl }}</p>
-                <p class="p-bridgy-twitter-content">🔖 {{ $bookmark->url }} 🔗 {{ $bookmark->longurl }}</p>
-                <!-- these empty tags are for https://brid.gy’s publishing service -->
-                <a href="https://brid.gy/publish/twitter"></a>
-                <a href="https://brid.gy/publish/facebook"></a>
-            </div>
+    @include('templates.bookmark', ['bookmark' => $bookmark])
 @stop
diff --git a/resources/views/contacts/index.blade.php b/resources/views/contacts/index.blade.php
index 82c6f35a..49bd9cbc 100644
--- a/resources/views/contacts/index.blade.php
+++ b/resources/views/contacts/index.blade.php
@@ -4,6 +4,6 @@
 
 @section('content')
 @foreach($contacts as $contact)
-            @include('templates.contact', ['contact' => $contact, 'image' => $contact->image])
+    @include('templates.contact', ['contact' => $contact, 'image' => $contact->image])
 @endforeach
 @stop
diff --git a/resources/views/contacts/show.blade.php b/resources/views/contacts/show.blade.php
index 3219fc8d..ae4a4286 100644
--- a/resources/views/contacts/show.blade.php
+++ b/resources/views/contacts/show.blade.php
@@ -3,5 +3,8 @@
 @section('title')Contacts « @stop
 
 @section('content')
-            @include('templates.contact', ['contact' => $contact, 'image' => $image])
+    @include('templates.contact', [
+        'contact' => $contact,
+        'image' => $image,
+    ])
 @stop
diff --git a/resources/views/front-page.blade.php b/resources/views/front-page.blade.php
index 975612a2..4906e432 100644
--- a/resources/views/front-page.blade.php
+++ b/resources/views/front-page.blade.php
@@ -20,7 +20,7 @@
                     @include('templates.like', ['like' => $item])
                     @break
                 @case($item instanceof \App\Models\Bookmark)
-                    <p>This is a bookmark</p>
+                    @include('templates.bookmark', ['bookmark' => $item])
                     @break
             @endswitch
         @endforeach
diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php
index 6db39376..86465c0e 100644
--- a/resources/views/master.blade.php
+++ b/resources/views/master.blade.php
@@ -4,10 +4,10 @@
         <meta charset="UTF-8">
         <title>@if (App::environment() == 'local'){!! "[testing] -"!!}@endif @yield('title'){{ config('app.display_name') }}</title>
         <meta name="viewport" content="width=device-width">
+        <link rel="stylesheet" href="https://use.typekit.net/csl8adl.css">
         <link rel="stylesheet" href="/assets/frontend/normalize.css">
         <link rel="stylesheet" href="/assets/app.css">
         <link rel="stylesheet" href="/assets/highlight/zenburn.css">
-        <link rel="stylesheet" href="https://use.typekit.net/csl8adl.css">
         <link rel="alternate" type="application/rss+xml" title="Blog RSS Feed" href="/blog/feed.rss">
         <link rel="alternate" type="application/atom+xml" title="Blog Atom Feed" href="/blog/feed.atom">
         <link rel="alternate" type="application/json" title="Blog JSON Feed" href="/blog/feed.json">
@@ -24,7 +24,7 @@
         <link rel="pgpkey" href="/assets/jonnybarnes-public-key-ecc.asc">
     </head>
     <body>
-        <header id="topheader">
+        <header id="top-header">
             <a rel="author" href="/">
                 <h1>{{ config('app.display_name') }}</h1>
             </a>
diff --git a/resources/views/notes/tagged.blade.php b/resources/views/notes/tagged.blade.php
index 2c1d8b2f..16f09e8e 100644
--- a/resources/views/notes/tagged.blade.php
+++ b/resources/views/notes/tagged.blade.php
@@ -3,11 +3,11 @@
 @section('title')Tagged Notes « @stop
 
 @section('content')
-            <h2>Notes tagged with <em>{{ $tag }}</em></h2>
-@foreach ($notes as $note)
-            <div class="note">
-                {!! $note->note !!}
-                <a href="/note/{{ $note->id }}">{{ $note->humandiff }}</a>
-            </div>
-@endforeach
+    <h2>Notes tagged with <em>{{ $tag }}</em></h2>
+    @foreach ($notes as $note)
+        <div class="note">
+            {!! $note->note !!}
+            <a href="/note/{{ $note->id }}">{{ $note->humandiff }}</a>
+        </div>
+    @endforeach
 @stop
diff --git a/resources/views/templates/bookmark.blade.php b/resources/views/templates/bookmark.blade.php
new file mode 100644
index 00000000..4da87521
--- /dev/null
+++ b/resources/views/templates/bookmark.blade.php
@@ -0,0 +1,34 @@
+<div class="h-entry">
+    <p>
+        <a class="u-bookmark-of<?php if ($bookmark->name !== null) { echo ' h-cite'; } ?>" href="{{ $bookmark->url }}">
+            @isset($bookmark->name)
+                {{ $bookmark->name }}
+            @endisset
+
+            @empty($bookmark->name)
+                {{ $bookmark->url }}
+            @endempty
+        </a>
+    </p>
+    @isset($bookmark->content)
+        <p>{{ $bookmark->content }}</p>
+    @endisset
+    @isset($bookmark->screenshot)
+        <img class="screenshot" src="/assets/img/bookmarks/{{ $bookmark->screenshot }}.png">
+    @endisset
+    @isset($bookmark->archive)
+        <p><a href="https://web.archive.org{{ $bookmark->archive }}">Internet Archive backup</a></p>
+    @endisset
+    @if(count($bookmark->tags) > 0)
+        <ul class="tags">
+            @foreach($bookmark->tags as $tag)
+                <li><a href="/bookmarks/tagged/{{ $tag->tag }}" class="tag">{{ $tag->tag }}</a></li>
+            @endforeach
+        </ul>
+    @endif
+    <p class="p-bridgy-facebook-content">🔖 {{ $bookmark->url }} 🔗 {{ $bookmark->longurl }}</p>
+    <p class="p-bridgy-twitter-content">🔖 {{ $bookmark->url }} 🔗 {{ $bookmark->longurl }}</p>
+    <!-- these empty tags are for https://brid.gy’s publishing service -->
+    <a href="https://brid.gy/publish/twitter"></a>
+    <a href="https://brid.gy/publish/facebook"></a>
+</div>
diff --git a/resources/views/templates/note.blade.php b/resources/views/templates/note.blade.php
index e2404a3e..0ab9d4c2 100644
--- a/resources/views/templates/note.blade.php
+++ b/resources/views/templates/note.blade.php
@@ -28,7 +28,7 @@ try {
 @if($note->replies_count > 0) @include('templates.replies-icon'): {{ $note->replies_count }}@endif
 
                             </div>
-                            <div class="social-links">
+                            <div class="syndication-links">
 @if(
     $note->tweet_id ||
     $note->facebook_url ||
diff --git a/resources/views/templates/social-links.blade.php b/resources/views/templates/social-links.blade.php
index f6017c83..eb569aca 100644
--- a/resources/views/templates/social-links.blade.php
+++ b/resources/views/templates/social-links.blade.php
@@ -1,20 +1,39 @@
 @if($tweet_id !== null)<a class="u-syndication" href="https://twitter.com/i/web/status/{{ $tweet_id }}" title="View note on Twitter">
-    <svg xmlns="http://www.w3.org/2000/svg" version="1.1" preserveAspectRatio="xMinYMin meet" viewBox="0 0 171.5054 139.37839" class="icon">
-        <g transform="translate(-282.32053,-396.30734)">
-            <path fill="#4099FF" d="m 453.82593,412.80619 c -6.3097,2.79897 -13.09189,4.68982 -20.20852,5.54049 7.26413,-4.35454 12.84406,-11.24992 15.47067,-19.46675 -6.79934,4.03295 -14.3293,6.96055 -22.34461,8.53841 -6.41775,-6.83879 -15.56243,-11.111 -25.68298,-11.111 -19.43159,0 -35.18696,15.75365 -35.18696,35.18525 0,2.75781 0.31128,5.44359 0.91155,8.01875 -29.24344,-1.46723 -55.16995,-15.47582 -72.52461,-36.76396 -3.02879,5.19662 -4.76443,11.24048 -4.76443,17.6891 0,12.20777 6.21194,22.97747 15.65332,29.28716 -5.76773,-0.18265 -11.19331,-1.76565 -15.93716,-4.40083 -0.004,0.14663 -0.004,0.29412 -0.004,0.44248 0,17.04767 12.12889,31.26806 28.22555,34.50266 -2.95247,0.80436 -6.06101,1.23398 -9.26989,1.23398 -2.2673,0 -4.47114,-0.22124 -6.62011,-0.63114 4.47801,13.97857 17.47214,24.15143 32.86992,24.43441 -12.04227,9.43796 -27.21366,15.06335 -43.69965,15.06335 -2.84014,0 -5.64082,-0.16722 -8.39349,-0.49223 15.57186,9.98421 34.06703,15.8094 53.93768,15.8094 64.72024,0 100.11301,-53.61524 100.11301,-100.11387 0,-1.52554 -0.0343,-3.04251 -0.10204,-4.55261 6.87394,-4.95995 12.83891,-11.15646 17.55618,-18.21305 z" />
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400">
+        <defs>
+            <style>
+                .cls-1 {
+                    fill:#1da1f2;
+                }
+                .cls-2 {
+                    fill:#fff;
+                }
+                .cls-3 {
+                    fill:none;
+                }
+            </style>
+        </defs>
+        <g data-name="Dark Blue">
+            <rect class="cls-1" width="400" height="400"/>
+        </g>
+        <g data-name="Logo — FIXED">
+            <path class="cls-2" d="M153.62,301.59c94.34,0,145.94-78.16,145.94-145.94,0-2.22,0-4.43-.15-6.63A104.36,104.36,0,0,0,325,122.47a102.38,102.38,0,0,1-29.46,8.07,51.47,51.47,0,0,0,22.55-28.37,102.79,102.79,0,0,1-32.57,12.45,51.34,51.34,0,0,0-87.41,46.78A145.62,145.62,0,0,1,92.4,107.81a51.33,51.33,0,0,0,15.88,68.47A50.91,50.91,0,0,1,85,169.86c0,.21,0,.43,0,.65a51.31,51.31,0,0,0,41.15,50.28,51.21,51.21,0,0,1-23.16.88,51.35,51.35,0,0,0,47.92,35.62,102.92,102.92,0,0,1-63.7,22A104.41,104.41,0,0,1,75,278.55a145.21,145.21,0,0,0,78.62,23"/>
+            <rect class="cls-3" width="400" height="400"/>
         </g>
     </svg>
 </a>@endif
 @if($facebook_url !== null)<a class="u-syndication" href="{{ $facebook_url }}" title="View note on Facebook">
-    <svg xmlns="http://www.w3.org/2000/svg" version="1.1" preserveAspectRatio="xMinYMin meet" viewBox="0 0 266.893 266.895" class="icon">
-        <path fill="#3C5A99" d="M248.082,262.307c7.854,0,14.223-6.369,14.223-14.225V18.812
-            c0-7.857-6.368-14.224-14.223-14.224H18.812c-7.857,0-14.224,6.367-14.224,14.224v229.27c0,7.855,6.366,14.225,14.224,14.225
-            H248.082z"
-        />
-        <path fill="#FFFFFF" d="M182.409,262.307v-99.803h33.499l5.016-38.895h-38.515V98.777c0-11.261,3.127-18.935,19.275-18.935
-            l20.596-0.009V45.045c-3.562-0.474-15.788-1.533-30.012-1.533c-29.695,0-50.025,18.126-50.025,51.413v28.684h-33.585v38.895h33.585
-            v99.803H182.409z"
-        />
+    <svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="14.2222in" height="14.2222in" version="1.1" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" viewBox="0 0 14222 14222" xmlns:xlink="http://www.w3.org/1999/xlink">
+        <defs>
+            <style type="text/css">
+                .fil0 {fill:#1977F3;fill-rule:nonzero}
+                .fil1 {fill:#FEFEFE;fill-rule:nonzero}
+             </style>
+        </defs>
+        <g>
+            <path class="fil0" d="M14222 7111c0,-3927 -3184,-7111 -7111,-7111 -3927,0 -7111,3184 -7111,7111 0,3549 2600,6491 6000,7025l0 -4969 -1806 0 0 -2056 1806 0 0 -1567c0,-1782 1062,-2767 2686,-2767 778,0 1592,139 1592,139l0 1750 -897 0c-883,0 -1159,548 -1159,1111l0 1334 1972 0 -315 2056 -1657 0 0 4969c3400,-533 6000,-3475 6000,-7025z"/>
+            <path class="fil1" d="M9879 9167l315 -2056 -1972 0 0 -1334c0,-562 275,-1111 1159,-1111l897 0 0 -1750c0,0 -814,-139 -1592,-139 -1624,0 -2686,984 -2686,2767l0 1567 -1806 0 0 2056 1806 0 0 4969c362,57 733,86 1111,86 378,0 749,-30 1111,-86l0 -4969 1657 0z"/>
+        </g>
     </svg>
 </a>@endif
 @if($swarm_url !== null)<a class="u-syndication" href="{{ $swarm_url }}" title="View note on Swarm">
@@ -23,7 +42,7 @@
     </svg>
 </a>@endif
 @if($instagram_url !== null)<a class="u-syndication" href="{{ $instagram_url }}" title="View note on Instagram">
-    <svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" preserveAspectRatio="xMinYMin meet" viewBox="0 0 130 130" class="icon">
-        <defs><linearGradient id="b"><stop offset="0" stop-color="#3771c8"/><stop stop-color="#3771c8" offset=".128"/><stop offset="1" stop-color="#60f" stop-opacity="0"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#fd5"/><stop offset=".1" stop-color="#fd5"/><stop offset=".5" stop-color="#ff543e"/><stop offset="1" stop-color="#c837ab"/></linearGradient><radialGradient id="c" cx="158.429" cy="578.088" r="65" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 -1.98198 1.8439 0 -1031.402 454.004)" fx="158.429" fy="578.088"/><radialGradient id="d" cx="147.694" cy="473.455" r="65" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.17394 .86872 -3.5818 .71718 1648.348 -458.493)" fx="147.694" fy="473.455"/></defs><path fill="url(#c)" d="M65.03 0C37.888 0 29.95.028 28.407.156c-5.57.463-9.036 1.34-12.812 3.22-2.91 1.445-5.205 3.12-7.47 5.468C4 13.126 1.5 18.394.595 24.656c-.44 3.04-.568 3.66-.594 19.188-.01 5.176 0 11.988 0 21.125 0 27.12.03 35.05.16 36.59.45 5.42 1.3 8.83 3.1 12.56 3.44 7.14 10.01 12.5 17.75 14.5 2.68.69 5.64 1.07 9.44 1.25 1.61.07 18.02.12 34.44.12 16.42 0 32.84-.02 34.41-.1 4.4-.207 6.955-.55 9.78-1.28 7.79-2.01 14.24-7.29 17.75-14.53 1.765-3.64 2.66-7.18 3.065-12.317.088-1.12.125-18.977.125-36.81 0-17.836-.04-35.66-.128-36.78-.41-5.22-1.305-8.73-3.127-12.44-1.495-3.037-3.155-5.305-5.565-7.624C116.9 4 111.64 1.5 105.372.596 102.335.157 101.73.027 86.19 0H65.03z" transform="translate(1.004 1)"/><path fill="url(#d)" d="M65.03 0C37.888 0 29.95.028 28.407.156c-5.57.463-9.036 1.34-12.812 3.22-2.91 1.445-5.205 3.12-7.47 5.468C4 13.126 1.5 18.394.595 24.656c-.44 3.04-.568 3.66-.594 19.188-.01 5.176 0 11.988 0 21.125 0 27.12.03 35.05.16 36.59.45 5.42 1.3 8.83 3.1 12.56 3.44 7.14 10.01 12.5 17.75 14.5 2.68.69 5.64 1.07 9.44 1.25 1.61.07 18.02.12 34.44.12 16.42 0 32.84-.02 34.41-.1 4.4-.207 6.955-.55 9.78-1.28 7.79-2.01 14.24-7.29 17.75-14.53 1.765-3.64 2.66-7.18 3.065-12.317.088-1.12.125-18.977.125-36.81 0-17.836-.04-35.66-.128-36.78-.41-5.22-1.305-8.73-3.127-12.44-1.495-3.037-3.155-5.305-5.565-7.624C116.9 4 111.64 1.5 105.372.596 102.335.157 101.73.027 86.19 0H65.03z" transform="translate(1.004 1)"/><path fill="#fff" d="M66.004 18c-13.036 0-14.672.057-19.792.29-5.11.234-8.598 1.043-11.65 2.23-3.157 1.226-5.835 2.866-8.503 5.535-2.67 2.668-4.31 5.346-5.54 8.502-1.19 3.053-2 6.542-2.23 11.65C18.06 51.327 18 52.964 18 66s.058 14.667.29 19.787c.235 5.11 1.044 8.598 2.23 11.65 1.227 3.157 2.867 5.835 5.536 8.503 2.667 2.67 5.345 4.314 8.5 5.54 3.054 1.187 6.543 1.996 11.652 2.23 5.12.233 6.755.29 19.79.29 13.037 0 14.668-.057 19.788-.29 5.11-.234 8.602-1.043 11.656-2.23 3.156-1.226 5.83-2.87 8.497-5.54 2.67-2.668 4.31-5.346 5.54-8.502 1.18-3.053 1.99-6.542 2.23-11.65.23-5.12.29-6.752.29-19.788 0-13.036-.06-14.672-.29-19.792-.24-5.11-1.05-8.598-2.23-11.65-1.23-3.157-2.87-5.835-5.54-8.503-2.67-2.67-5.34-4.31-8.5-5.535-3.06-1.187-6.55-1.996-11.66-2.23-5.12-.233-6.75-.29-19.79-.29zm-4.306 8.65c1.278-.002 2.704 0 4.306 0 12.816 0 14.335.046 19.396.276 4.68.214 7.22.996 8.912 1.653 2.24.87 3.837 1.91 5.516 3.59 1.68 1.68 2.72 3.28 3.592 5.52.657 1.69 1.44 4.23 1.653 8.91.23 5.06.28 6.58.28 19.39s-.05 14.33-.28 19.39c-.214 4.68-.996 7.22-1.653 8.91-.87 2.24-1.912 3.835-3.592 5.514-1.68 1.68-3.275 2.72-5.516 3.59-1.69.66-4.232 1.44-8.912 1.654-5.06.23-6.58.28-19.396.28-12.817 0-14.336-.05-19.396-.28-4.68-.216-7.22-.998-8.913-1.655-2.24-.87-3.84-1.91-5.52-3.59-1.68-1.68-2.72-3.276-3.592-5.517-.657-1.69-1.44-4.23-1.653-8.91-.23-5.06-.276-6.58-.276-19.398s.046-14.33.276-19.39c.214-4.68.996-7.22 1.653-8.912.87-2.24 1.912-3.84 3.592-5.52 1.68-1.68 3.28-2.72 5.52-3.592 1.692-.66 4.233-1.44 8.913-1.655 4.428-.2 6.144-.26 15.09-.27zm29.928 7.97c-3.18 0-5.76 2.577-5.76 5.758 0 3.18 2.58 5.76 5.76 5.76 3.18 0 5.76-2.58 5.76-5.76 0-3.18-2.58-5.76-5.76-5.76zm-25.622 6.73c-13.613 0-24.65 11.037-24.65 24.65 0 13.613 11.037 24.645 24.65 24.645C79.617 90.645 90.65 79.613 90.65 66S79.616 41.35 66.003 41.35zm0 8.65c8.836 0 16 7.163 16 16 0 8.836-7.164 16-16 16-8.837 0-16-7.164-16-16 0-8.837 7.163-16 16-16z"/>
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
+        <path d="M224.1 141c-63.6 0-114.9 51.3-114.9 114.9s51.3 114.9 114.9 114.9S339 319.5 339 255.9 287.7 141 224.1 141zm0 189.6c-41.1 0-74.7-33.5-74.7-74.7s33.5-74.7 74.7-74.7 74.7 33.5 74.7 74.7-33.6 74.7-74.7 74.7zm146.4-194.3c0 14.9-12 26.8-26.8 26.8-14.9 0-26.8-12-26.8-26.8s12-26.8 26.8-26.8 26.8 12 26.8 26.8zm76.1 27.2c-1.7-35.9-9.9-67.7-36.2-93.9-26.2-26.2-58-34.4-93.9-36.2-37-2.1-147.9-2.1-184.9 0-35.8 1.7-67.6 9.9-93.9 36.1s-34.4 58-36.2 93.9c-2.1 37-2.1 147.9 0 184.9 1.7 35.9 9.9 67.7 36.2 93.9s58 34.4 93.9 36.2c37 2.1 147.9 2.1 184.9 0 35.9-1.7 67.7-9.9 93.9-36.2 26.2-26.2 34.4-58 36.2-93.9 2.1-37 2.1-147.8 0-184.8zM398.8 388c-7.8 19.6-22.9 34.7-42.6 42.6-29.5 11.7-99.5 9-132.1 9s-102.7 2.6-132.1-9c-19.6-7.8-34.7-22.9-42.6-42.6-11.7-29.5-9-99.5-9-132.1s-2.6-102.7 9-132.1c7.8-19.6 22.9-34.7 42.6-42.6 29.5-11.7 99.5-9 132.1-9s102.7-2.6 132.1 9c19.6 7.8 34.7 22.9 42.6 42.6 11.7 29.5 9 99.5 9 132.1s2.7 102.7-9 132.1z"/>
     </svg>
 </a>@endif
diff --git a/resources/views/webmention-endpoint.blade.php b/resources/views/webmention-endpoint.blade.php
index 11d53aeb..76f3fd0b 100644
--- a/resources/views/webmention-endpoint.blade.php
+++ b/resources/views/webmention-endpoint.blade.php
@@ -3,5 +3,5 @@
 @section('title')WebMentions « @stop
 
 @section('content')
-            <p>My WebMention endpoint.</p>
+    <p>My WebMention endpoint.</p>
 @stop
diff --git a/tests/Feature/ArticlesTest.php b/tests/Feature/ArticlesTest.php
index ec051cc0..9b584f40 100644
--- a/tests/Feature/ArticlesTest.php
+++ b/tests/Feature/ArticlesTest.php
@@ -15,19 +15,19 @@ class ArticlesTest extends TestCase
 
     public function test_single_article()
     {
-        $response = $this->get('/blog/' . date('Y') . '/' . date('m') . '/my-new-blog');
+        $response = $this->get('/blog/' . date('Y') . '/' . date('m') . '/some-code-i-did');
         $response->assertViewIs('articles.show');
     }
 
     public function test_wrong_date_redirects()
     {
-        $response = $this->get('/blog/1900/01/my-new-blog');
-        $response->assertRedirect('/blog/' . date('Y') . '/' . date('m') . '/my-new-blog');
+        $response = $this->get('/blog/1900/01/some-code-i-did');
+        $response->assertRedirect('/blog/' . date('Y') . '/' . date('m') . '/some-code-i-did');
     }
 
     public function test_redirect_for_id()
     {
-        $response = $this->get('/blog/s/1');
-        $response->assertRedirect('/blog/' . date('Y') . '/' . date('m') . '/my-new-blog');
+        $response = $this->get('/blog/s/2');
+        $response->assertRedirect('/blog/' . date('Y') . '/' . date('m') . '/some-code-i-did');
     }
 }
diff --git a/tests/Feature/BridgyPosseTest.php b/tests/Feature/BridgyPosseTest.php
index 7adcaf5e..a64b037b 100644
--- a/tests/Feature/BridgyPosseTest.php
+++ b/tests/Feature/BridgyPosseTest.php
@@ -8,7 +8,7 @@ class BridgyPosseTest extends TestCase
 {
     public function test_bridgy_twitter_content()
     {
-        $response = $this->get('/notes/E');
+        $response = $this->get('/notes/4');
 
         $html = $response->content();
         $this->assertTrue(is_string(mb_stristr($html, 'p-bridgy-twitter-content')));
diff --git a/tests/Feature/LikesTest.php b/tests/Feature/LikesTest.php
index 70a8d290..4f66da87 100644
--- a/tests/Feature/LikesTest.php
+++ b/tests/Feature/LikesTest.php
@@ -2,7 +2,9 @@
 
 namespace Tests\Feature;
 
+use Codebird\Codebird;
 use Queue;
+use stdClass;
 use Tests\TestCase;
 use App\Models\Like;
 use Tests\TestToken;
@@ -191,6 +193,7 @@ END;
         $handler = HandlerStack::create($mock);
         $client = new Client(['handler' => $handler]);
         $this->app->bind(Client::class, $client);
+
         $authorship = new Authorship();
 
         $job->handle($client, $authorship);
diff --git a/tests/Feature/MicropubControllerTest.php b/tests/Feature/MicropubControllerTest.php
index 27f0757f..1098258c 100644
--- a/tests/Feature/MicropubControllerTest.php
+++ b/tests/Feature/MicropubControllerTest.php
@@ -676,7 +676,7 @@ class MicropubControllerTest extends TestCase
             '/api/post',
             [
                 'action' => 'update',
-                'url' => config('app.url') . '/notes/L',
+                'url' => config('app.url') . '/notes/B',
                 'replace' => [
                     'syndication' => [
                         'https://www.swarmapp.com/checkin/the-id',
diff --git a/tests/Unit/ArticlesTest.php b/tests/Unit/ArticlesTest.php
index 8cc696c2..d4cf13d3 100644
--- a/tests/Unit/ArticlesTest.php
+++ b/tests/Unit/ArticlesTest.php
@@ -58,7 +58,7 @@ class ArticlesTest extends TestCase
     public function test_date_scope()
     {
         $yearAndMonth = Article::date(date('Y'), date('m'))->get();
-        $this->assertTrue(count($yearAndMonth) === 2);
+        $this->assertTrue(count($yearAndMonth) === 1);
 
         $monthDecember = Article::date(date('Y') - 1, 12)->get();
         $this->assertTrue(count($monthDecember) === 0);
diff --git a/tests/Unit/NotesTest.php b/tests/Unit/NotesTest.php
index c472c640..cb6c5b72 100644
--- a/tests/Unit/NotesTest.php
+++ b/tests/Unit/NotesTest.php
@@ -8,7 +8,6 @@ use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use App\Models\{Media, Note, Tag};
 use GuzzleHttp\Handler\MockHandler;
-use Thujohn\Twitter\Facades\Twitter;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class NotesTest extends TestCase
@@ -24,7 +23,7 @@ class NotesTest extends TestCase
     public function test_get_note_attribute_method()
     {
         $expected = '<p>Having a <a rel="tag" class="p-category" href="/notes/tagged/beer">#beer</a> at the local. <span role="img" aria-label="beer mug">🍺</span></p>' . PHP_EOL;
-        $note = Note::find(12);
+        $note = Note::find(2);
         $this->assertEquals($expected, $note->note);
     }
 
@@ -36,7 +35,7 @@ class NotesTest extends TestCase
     public function test_default_image_used_in_makehcards_method()
     {
         $expected = '<p>Hi <span class="u-category h-card mini-h-card"><a class="u-url p-name" href="http://tantek.com">Tantek Çelik</a><span class="hovercard"> <a class="u-url" href="https://twitter.com/t"><img class="social-icon" src="/assets/img/social-icons/twitter.svg"> t</a><img class="u-photo" alt="" src="/assets/profile-images/default-image"></span></span></p>' . PHP_EOL;
-        $note = Note::find(14);
+        $note = Note::find(4);
         $this->assertEquals($expected, $note->note);
     }
 
@@ -48,7 +47,7 @@ class NotesTest extends TestCase
     public function test_specific_profile_image_used_in_makehcards_method()
     {
         $expected = '<p>Hi <span class="u-category h-card mini-h-card"><a class="u-url p-name" href="https://aaronparecki.com">Aaron Parecki</a><span class="hovercard"><a class="u-url" href="https://www.facebook.com/123456"><img class="social-icon" src="/assets/img/social-icons/facebook.svg"> Facebook</a> <img class="u-photo" alt="" src="/assets/profile-images/aaronparecki.com/image"></span></span></p>' . PHP_EOL;
-        $note = Note::find(15);
+        $note = Note::find(5);
         $this->assertEquals($expected, $note->note);
     }
 
@@ -60,7 +59,7 @@ class NotesTest extends TestCase
     public function test_twitter_link_created_when_no_contact_found()
     {
         $expected = '<p>Hi <a href="https://twitter.com/bob">@bob</a></p>' . PHP_EOL;
-        $note = Note::find(16);
+        $note = Note::find(6);
         $this->assertEquals($expected, $note->note);
     }
 
@@ -72,7 +71,7 @@ class NotesTest extends TestCase
 
     public function test_latlng_of_associated_place()
     {
-        $note = Note::find(12); // should be having beer at bridgewater note
+        $note = Note::find(2); // should be having beer at bridgewater note
         $this->assertEquals('53.4983', $note->latitude);
         $this->assertEquals('-2.3805', $note->longitude);
     }
@@ -86,7 +85,7 @@ class NotesTest extends TestCase
 
     public function test_address_attribute_for_places()
     {
-        $note = Note::find(12);
+        $note = Note::find(2);
         $this->assertEquals('The Bridgewater Pub', $note->address);
     }
 
@@ -280,12 +279,8 @@ JSON;
     /** @test */
     public function twitter_content_is_null_when_oembed_error_occurs()
     {
-        Twitter::shouldReceive('getOembed')
-            ->once()
-            ->andThrow('Exception');
-
         $note = new Note();
-        $note->in_reply_to = 'https://twitter.com/foo';
+        $note->in_reply_to = 'https://twitter.com/search';
 
         $this->assertNull($note->twitter);
     }
diff --git a/tests/Unit/WebMentionTest.php b/tests/Unit/WebMentionTest.php
index 22b94384..822d5286 100644
--- a/tests/Unit/WebMentionTest.php
+++ b/tests/Unit/WebMentionTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Unit;
 
+use Codebird\Codebird;
 use Tests\TestCase;
 use App\Models\WebMention;
 use Thujohn\Twitter\Facades\Twitter;
@@ -94,18 +95,21 @@ class WebMentionTest extends TestCase
 
     public function test_create_photo_link_with_noncached_twitter_url()
     {
+        $info = new \stdClass();
+        $info->profile_image_url_https = 'https://pbs.twimg.com/static_profile_link.jpg';
+        $codebirdMock = $this->getMockBuilder(Codebird::class)
+            ->addMethods(['users_show'])
+            ->getMock();
+        $codebirdMock->method('users_show')
+            ->willReturn($info);
+        $this->app->instance(Codebird::class, $codebirdMock);
+
         Cache::shouldReceive('has')
                     ->once()
                     ->andReturn(false);
         Cache::shouldReceive('put')
                     ->once()
                     ->andReturn(true);
-        $info = new \stdClass();
-        $info->profile_image_url_https = 'https://pbs.twimg.com/static_profile_link.jpg';
-        Twitter::shouldReceive('getUsers')
-                    ->once()
-                    ->with(['screen_name' => 'example'])
-                    ->andReturn($info);
 
         $webmention = new WebMention();
         $twitterURL = 'https://twitter.com/example';